Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.5

into nuts.ninka.net:/disk1/davem/BK/sparc-2.5

arch/sparc64/kernel/smp.c

@@ -720,9 +720,10 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
 void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
 {
 	cpumask_t mask = cpu_online_map;
-	cpu_clear(smp_processor_id(), mask);
 	u64 data0;
 
+	cpu_clear(smp_processor_id(), mask);
+
 #ifdef CONFIG_DEBUG_DCFLUSH
 	atomic_inc(&dcpage_flushes);
 #endif

arch/sparc64/kernel/sparc64_ksyms.c

@@ -68,7 +68,6 @@ extern void die_if_kernel(char *str, struct pt_regs *regs);
 extern pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
 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);

include/asm-sparc64/uaccess.h

@@ -263,9 +263,10 @@ extern unsigned long __copy_in_user(void __user *to, const void __user *from,
 #define copy_to_user __copy_to_user
 #define copy_in_user __copy_in_user
 
+extern unsigned long __bzero_noasi(void *, unsigned long);
+
 static inline unsigned long __clear_user(void __user *addr, unsigned long size)
 {
-	extern unsigned long __bzero_noasi(void *addr, unsigned long size);
 	
 	return __bzero_noasi((void *) addr, size);
 }