From 8d9107be3302061434072eee2c6934d2286bbf02 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 3 May 2010 14:57:11 +0200 Subject: [PATCH] --- yaml --- r: 191531 b: refs/heads/master c: 4677d4a53e0d565742277e8913e91c821453e63e h: refs/heads/master i: 191529: c74ee4e546be7f07b41c50aa1637402e928365d3 191527: 28a2c948df904fc65857586cdbb4d23c76fc5acb v: v3 --- [refs] | 2 +- trunk/include/asm-generic/bitops/arch_hweight.h | 8 ++++---- trunk/include/linux/bitops.h | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d6f837effc3f..893f327a3024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d61931d89be506372d01a90d1755f6d0a9fafe2d +refs/heads/master: 4677d4a53e0d565742277e8913e91c821453e63e diff --git a/trunk/include/asm-generic/bitops/arch_hweight.h b/trunk/include/asm-generic/bitops/arch_hweight.h index 9a81c1e9436c..6a211f40665c 100644 --- a/trunk/include/asm-generic/bitops/arch_hweight.h +++ b/trunk/include/asm-generic/bitops/arch_hweight.h @@ -3,22 +3,22 @@ #include -inline unsigned int __arch_hweight32(unsigned int w) +static inline unsigned int __arch_hweight32(unsigned int w) { return __sw_hweight32(w); } -inline unsigned int __arch_hweight16(unsigned int w) +static inline unsigned int __arch_hweight16(unsigned int w) { return __sw_hweight16(w); } -inline unsigned int __arch_hweight8(unsigned int w) +static inline unsigned int __arch_hweight8(unsigned int w) { return __sw_hweight8(w); } -inline unsigned long __arch_hweight64(__u64 w) +static inline unsigned long __arch_hweight64(__u64 w) { return __sw_hweight64(w); } diff --git a/trunk/include/linux/bitops.h b/trunk/include/linux/bitops.h index c55d5bc4ee58..26caa608ccd9 100644 --- a/trunk/include/linux/bitops.h +++ b/trunk/include/linux/bitops.h @@ -10,6 +10,11 @@ #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) #endif +extern unsigned int __sw_hweight8(unsigned int w); +extern unsigned int __sw_hweight16(unsigned int w); +extern unsigned int __sw_hweight32(unsigned int w); +extern unsigned long __sw_hweight64(__u64 w); + /* * Include this here because some architectures need generic_ffs/fls in * scope