diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
| commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
| tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /include/asm-x86_64/bitops.h | |
| parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'include/asm-x86_64/bitops.h')
| -rw-r--r-- | include/asm-x86_64/bitops.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h index a31bb99be53f..05a0d374404b 100644 --- a/include/asm-x86_64/bitops.h +++ b/include/asm-x86_64/bitops.h | |||
| @@ -348,8 +348,7 @@ static inline int sched_find_first_bit(const unsigned long *b) | |||
| 348 | return __ffs(b[0]); | 348 | return __ffs(b[0]); |
| 349 | if (b[1]) | 349 | if (b[1]) |
| 350 | return __ffs(b[1]) + 64; | 350 | return __ffs(b[1]) + 64; |
| 351 | if (b[2]) | 351 | return __ffs(b[2]) + 128; |
| 352 | return __ffs(b[2]) + 128; | ||
| 353 | } | 352 | } |
| 354 | 353 | ||
| 355 | /** | 354 | /** |