Merge nuts.davemloft.net:/disk1/BK/network-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
9b4ea1a1 · David S. Miller · 9b153b25 · 16bd7135 · 9b4ea1a1 · 9b4ea1a1
Commit 9b4ea1a1 authored Apr 27, 2004 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile Makefile +1 -1

include/asm-generic/cpumask_arith.h include/asm-generic/cpumask_arith.h +1 -1

No files found.
--- a/Makefile
+++ b/Makefile
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 6
-EXTRAVERSION =-rc2
+EXTRAVERSION =-rc3
 NAME=Zonked Quokka

 # *DOCUMENTATION*

--- a/include/asm-generic/cpumask_arith.h
+++ b/include/asm-generic/cpumask_arith.h
@@ -43,7 +43,7 @@
 #define cpus_promote(map)		({ map; })
 #define cpumask_of_cpu(cpu)		({ ((cpumask_t)1) << (cpu); })

-#define first_cpu(map)			__ffs(map)
+#define first_cpu(map)			find_first_bit(&(map), NR_CPUS)
 #define next_cpu(cpu, map)		find_next_bit(&(map), NR_CPUS, cpu + 1)

 #endif /* __ASM_GENERIC_CPUMASK_ARITH_H */