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

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 174919cb2c5ecb64c2e154f0ecc0a3e193a29c88..c875fbf09eac76097a4b2d4f2f36135278464b8a 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/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
                );

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 6127d73d1e8e4621ccab5235adf83ccc948137de..bb3fd74b0a2b65aeae2fc6ea5f52a2b043ad12f0 100644 (file)
--- a/arch/sparc64/mm/init.c
+++ b/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 *)

diff --git a/include/asm-sparc64/delay.h b/include/asm-sparc64/delay.h
index 0c3be9aec3616a782fa2bb82b3f1fa4b2df27c87..e6fced5dce1c5deb8546f7f347304f38e3f3b6e8 100644 (file)
--- a/include/asm-sparc64/delay.h
+++ b/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)