diff options
author | Ingo Molnar | 2010-11-18 13:22:14 +0100 |
---|---|---|
committer | Ingo Molnar | 2010-11-18 13:22:26 +0100 |
commit | 92fd4d4d67b945c0766416284d4ab236b31542c4 (patch) | |
tree | 00b8b5f90748f752ccaba3dddbe271091d93543a /arch/x86/include/asm/bitops.h | |
parent | sched: Make sched_param argument static in sched_setscheduler() callers (diff) | |
parent | Linux 2.6.37-rc2 (diff) | |
download | kernel-qcow2-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.tar.gz kernel-qcow2-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.tar.xz kernel-qcow2-linux-92fd4d4d67b945c0766416284d4ab236b31542c4.zip |
Merge commit 'v2.6.37-rc2' into sched/core
Merge reason: Move to a .37-rc base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/bitops.h')
-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) #ifdef __KERNEL__ +#include <asm-generic/bitops/find.h> + #include <asm-generic/bitops/sched.h> #define ARCH_HAS_FAST_MULTIPLIER 1 |