git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'docs-next' of git://git.lwn.net/linux-2.6
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
bitops_64.h
diff --git
a/arch/sparc/include/asm/bitops_64.h
b/arch/sparc/include/asm/bitops_64.h
index
e72ac9c
..
766121a
100644
(file)
--- a/
arch/sparc/include/asm/bitops_64.h
+++ b/
arch/sparc/include/asm/bitops_64.h
@@
-44,7
+44,7
@@
extern void change_bit(unsigned long nr, volatile unsigned long *addr);
#ifdef ULTRA_HAS_POPULATION_COUNT
#ifdef ULTRA_HAS_POPULATION_COUNT
-static inline unsigned int hweight64(unsigned long w)
+static inline unsigned int
__arch_
hweight64(unsigned long w)
{
unsigned int res;
{
unsigned int res;
@@
-52,7
+52,7
@@
static inline unsigned int hweight64(unsigned long w)
return res;
}
return res;
}
-static inline unsigned int hweight32(unsigned int w)
+static inline unsigned int
__arch_
hweight32(unsigned int w)
{
unsigned int res;
{
unsigned int res;
@@
-60,7
+60,7
@@
static inline unsigned int hweight32(unsigned int w)
return res;
}
return res;
}
-static inline unsigned int hweight16(unsigned int w)
+static inline unsigned int
__arch_
hweight16(unsigned int w)
{
unsigned int res;
{
unsigned int res;
@@
-68,7
+68,7
@@
static inline unsigned int hweight16(unsigned int w)
return res;
}
return res;
}
-static inline unsigned int hweight8(unsigned int w)
+static inline unsigned int
__arch_
hweight8(unsigned int w)
{
unsigned int res;
{
unsigned int res;
@@
-78,9
+78,10
@@
static inline unsigned int hweight8(unsigned int w)
#else
#else
-#include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/
arch_
hweight.h>
#endif
#endif
+#include <asm-generic/bitops/const_hweight.h>
#include <asm-generic/bitops/lock.h>
#endif /* __KERNEL__ */
#include <asm-generic/bitops/lock.h>
#endif /* __KERNEL__ */