diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 14:17:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 14:17:06 -0400 |
| commit | db08bf0877f3464fb0c2c37dcdd9f9683192ea26 (patch) | |
| tree | c9d47587ac07cb1622156899414c78f097fcb0c9 /arch/x86 | |
| parent | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (diff) | |
| parent | 35dbc0e020c6587f78a6c17693beca73aead7b54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic/io.h: allow people to override individual funcs
bitops: remove duplicated extern declarations
bitops: make asm-generic/bitops/find.h more generic
asm-generic: kdebug.h: Checkpatch cleanup
asm-generic: fcntl: make exported headers use strict posix types
asm-generic: cmpxchg does not handle non-long arguments
asm-generic: make atomic_add_unless a function
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/bitops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h index bafd80defa43..903683b07e42 100644 --- a/arch/x86/include/asm/bitops.h +++ b/arch/x86/include/asm/bitops.h | |||
| @@ -440,6 +440,8 @@ static inline int fls(int x) | |||
| 440 | 440 | ||
| 441 | #ifdef __KERNEL__ | 441 | #ifdef __KERNEL__ |
| 442 | 442 | ||
| 443 | #include <asm-generic/bitops/find.h> | ||
| 444 | |||
| 443 | #include <asm-generic/bitops/sched.h> | 445 | #include <asm-generic/bitops/sched.h> |
| 444 | 446 | ||
| 445 | #define ARCH_HAS_FAST_MULTIPLIER 1 | 447 | #define ARCH_HAS_FAST_MULTIPLIER 1 |