diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-04-27 06:25:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-04-27 06:25:01 -0700 |
| commit | 9b4ea1a1614168c51afe0e6dff12e0b373d11e8b (patch) | |
| tree | 8420a6011630544d3030f5f71b67d860f5bcbe5e | |
| parent | 9b153b25320a92f5d81f1f71121897ad7f263c81 (diff) | |
| parent | 16bd713551a4857a002e8e28e3d6e7c6421d63bf (diff) | |
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/asm-generic/cpumask_arith.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 6 -EXTRAVERSION =-rc2 +EXTRAVERSION =-rc3 NAME=Zonked Quokka # *DOCUMENTATION* diff --git a/include/asm-generic/cpumask_arith.h b/include/asm-generic/cpumask_arith.h index 7325284843dd..b4d25ac46a9f 100644 --- 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 */ |