[SPARC64]: Make sure cpu_data[0].udelay_val gets setup on non-SMP (found by bde@nwlink.com).

arch/sparc64/mm/init.c

@@ -1706,10 +1706,6 @@ void __init mem_init(void)
 	unsigned long addr, last;
 	int i;
 
-#ifndef CONFIG_SMP
-	cpu_data(0).udelay_val = loops_per_jiffy;
-#endif
-
 	i = last_valid_pfn >> ((22 - PAGE_SHIFT) + 6);
 	i += 1;
 	sparc64_valid_addr_bitmap = (unsigned long *)

include/asm-sparc64/bugs.h

@@ -4,4 +4,13 @@
  *  Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
-static void check_bugs(void) { }
+#include <linux/config.h>
+
+extern unsigned long loops_per_jiffy;
+
+static void check_bugs(void)
+{
+#ifndef CONFIG_SMP
+	cpu_data(0).udelay_val = loops_per_jiffy;
+#endif
+}

include/asm-sparc64/delay.h

@@ -13,12 +13,6 @@
 
 #ifndef __ASSEMBLY__
 
-#ifdef CONFIG_SMP
-#include <asm/smp.h>
-#else
-extern unsigned long loops_per_jiffy;
-#endif 
-
 static __inline__ void __delay(unsigned long loops)
 {
 	__asm__ __volatile__(