[SPARC64]: Always use cpu_data().udelay_val.

arch/sparc64/kernel/setup.c

@@ -617,8 +617,8 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
 		   (long)num_possible_cpus(),
 		   (long)num_online_cpus()
 #ifndef CONFIG_SMP
-		   , loops_per_jiffy/(500000/HZ),
-		   (loops_per_jiffy/(5000/HZ)) % 100,
+		   , cpu_data(0).udelay_val/(500000/HZ),
+		   (cpu_data(0).udelay_val/(5000/HZ)) % 100,
 		   cpu_data(0).clock_tick
 #endif
 		);

arch/sparc64/mm/init.c

@@ -1706,6 +1706,10 @@ 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/delay.h

@@ -59,11 +59,7 @@ extern __inline__ void __ndelay(unsigned long usecs, unsigned long lps)
 	__delay(usecs * HZ);
 }
 
-#ifdef CONFIG_SMP
 #define __udelay_val cpu_data(smp_processor_id()).udelay_val
-#else
-#define __udelay_val loops_per_jiffy
-#endif
 
 #define udelay(usecs) __udelay((usecs),__udelay_val)
 #define ndelay(usecs) __ndelay((usecs),__udelay_val)