diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-03 12:54:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-03 12:54:51 -0500 |
| commit | e465b535ce5b2318798c68e1454917204494bfe3 (patch) | |
| tree | 7cd7af9813a1fe2bfb04f9edd149e0f152b6cb1d /arch | |
| parent | 7eb19553369c46cc1fa64caf120cbcab1b597f7c (diff) | |
| parent | 5ece5c5192d065c229da01e7b347c1d3877b59fa (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into cpus4096-v2
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/cris/include/asm/bitops.h | 1 | ||||
| -rw-r--r-- | arch/h8300/include/asm/bitops.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/include/asm/bitops.h b/arch/cris/include/asm/bitops.h index c0e62f811e09..9e69cfb7f134 100644 --- a/arch/cris/include/asm/bitops.h +++ b/arch/cris/include/asm/bitops.h | |||
| @@ -148,6 +148,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) | |||
| 148 | #define ffs kernel_ffs | 148 | #define ffs kernel_ffs |
| 149 | 149 | ||
| 150 | #include <asm-generic/bitops/fls.h> | 150 | #include <asm-generic/bitops/fls.h> |
| 151 | #include <asm-generic/bitops/__fls.h> | ||
| 151 | #include <asm-generic/bitops/fls64.h> | 152 | #include <asm-generic/bitops/fls64.h> |
| 152 | #include <asm-generic/bitops/hweight.h> | 153 | #include <asm-generic/bitops/hweight.h> |
| 153 | #include <asm-generic/bitops/find.h> | 154 | #include <asm-generic/bitops/find.h> |
diff --git a/arch/h8300/include/asm/bitops.h b/arch/h8300/include/asm/bitops.h index cb18e3b0aa94..cb9ddf5fc54f 100644 --- a/arch/h8300/include/asm/bitops.h +++ b/arch/h8300/include/asm/bitops.h | |||
| @@ -207,6 +207,7 @@ static __inline__ unsigned long __ffs(unsigned long word) | |||
| 207 | #endif /* __KERNEL__ */ | 207 | #endif /* __KERNEL__ */ |
| 208 | 208 | ||
| 209 | #include <asm-generic/bitops/fls.h> | 209 | #include <asm-generic/bitops/fls.h> |
| 210 | #include <asm-generic/bitops/__fls.h> | ||
| 210 | #include <asm-generic/bitops/fls64.h> | 211 | #include <asm-generic/bitops/fls64.h> |
| 211 | 212 | ||
| 212 | #endif /* _H8300_BITOPS_H */ | 213 | #endif /* _H8300_BITOPS_H */ |