[SPARC64]: Fix conflicting __bzero_noasi() prototypes.

tree 20ab6e47589a702fa0b4b8476cd5d41fcbd366d3
parent 63789b37d0e2344ca4da9d1c7dc49bae7368c466
author David S. Miller <[email protected]> Mon, 20 Jun 2005 08:28:11 -0700
committer David S. Miller <[email protected]> Mon, 20 Jun 2005 08:28:11 -0700

[SPARC64]: Fix conflicting __bzero_noasi() prototypes.

Signed-off-by: David S. Miller <[email protected]>

 arch/sparc64/kernel/sparc64_ksyms.c |    1 -
 include/asm-sparc64/uaccess.h       |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -63,7 +63,6 @@ extern unsigned prom_cpu_nodes[64];
 extern void die_if_kernel(char *str, struct pt_regs *regs);
 void _sigpause_common (unsigned int set, struct pt_regs *);
 extern void *__bzero(void *, size_t);
-extern void *__bzero_noasi(void *, size_t);
 extern void *__memscan_zero(void *, size_t);
 extern void *__memscan_generic(void *, int, size_t);
 extern int __memcmp(const void *, const void *, __kernel_size_t);
diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h
--- a/include/asm-sparc64/uaccess.h
+++ b/include/asm-sparc64/uaccess.h
@@ -294,10 +294,10 @@ static inline unsigned long copy_in_user
 }
 #define __copy_in_user copy_in_user
 
+extern __kernel_size_t __bzero_noasi(void *addr, __kernel_size_t size);
+	
 extern __inline__ __kernel_size_t __clear_user(void *addr, __kernel_size_t size)
 {
-	extern __kernel_size_t __bzero_noasi(void *addr, __kernel_size_t size);
-	
 	return __bzero_noasi(addr, size);
 }