summaryrefslogtreecommitdiff
path: root/arch/sparc/include/asm
diff options
context:
space:
mode:
authorVijay Kumar <vijay.ac.kumar@oracle.com>2017-10-11 21:50:03 +0300
committerDavid S. Miller <davem@davemloft.net>2017-11-15 08:26:46 +0300
commitbe52bbe3ea1ae2619ca64d67d56e84a9c7e358f9 (patch)
tree6f08176bf46591a21784199533d7f467613fc61f /arch/sparc/include/asm
parent41413a60352cf8a7f0dd4a869d6e5c3e25aa89b2 (diff)
downloadlinux-be52bbe3ea1ae2619ca64d67d56e84a9c7e358f9.tar.xz
sparc64: Define SPARC default __fls function
__fls will now require a boot time patching on T4 and above. Redefining it under arch/sparc/lib. Signed-off-by: Vijay Kumar <vijay.ac.kumar@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm')
-rw-r--r--arch/sparc/include/asm/bitops_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/bitops_64.h b/arch/sparc/include/asm/bitops_64.h
index 30aea561176f..d7a46e2480c0 100644
--- a/arch/sparc/include/asm/bitops_64.h
+++ b/arch/sparc/include/asm/bitops_64.h
@@ -23,10 +23,10 @@ void clear_bit(unsigned long nr, volatile unsigned long *addr);
void change_bit(unsigned long nr, volatile unsigned long *addr);
int fls(unsigned int word);
+int __fls(unsigned long word);
#include <asm-generic/bitops/non-atomic.h>
-#include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/fls64.h>
#ifdef __KERNEL__