From 0dfed24c083c619981b59729fad328c6b81ddb28 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@nuts.ninka.net>
Date: Tue, 19 Aug 2003 05:24:20 -0700
Subject: [PATCH] [SPARC64]: Kill up_clock_tick, use cpu_data().

---
 arch/sparc64/kernel/devices.c |  6 +++---
 arch/sparc64/kernel/setup.c   |  6 +-----
 arch/sparc64/kernel/time.c    | 17 -----------------
 include/asm-sparc64/timer.h   |  4 ----
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c
index 3678721d9275d..09a6f374c6089 100644
--- a/arch/sparc64/kernel/devices.c
+++ b/arch/sparc64/kernel/devices.c
@@ -131,9 +131,9 @@ void __init device_scan(void)
 			prom_printf("No cpu nodes, cannot continue\n");
 			prom_halt();
 		}
-		up_clock_tick = prom_getintdefault(cpu_node,
-						   "clock-frequency",
-						   0);
+		cpu_data(0).clock_tick = prom_getintdefault(cpu_node,
+							    "clock-frequency",
+							    0);
 	}
 #endif
 
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 67791a6a58bd3..174919cb2c5ec 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -593,10 +593,6 @@ extern void smp_info(struct seq_file *);
 extern void smp_bogo(struct seq_file *);
 extern void mmu_info(struct seq_file *);
 
-#ifndef CONFIG_SMP
-unsigned long up_clock_tick;
-#endif
-
 static int show_cpuinfo(struct seq_file *m, void *__unused)
 {
 	seq_printf(m, 
@@ -623,7 +619,7 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
 #ifndef CONFIG_SMP
 		   , loops_per_jiffy/(500000/HZ),
 		   (loops_per_jiffy/(5000/HZ)) % 100,
-		   up_clock_tick
+		   cpu_data(0).clock_tick
 #endif
 		);
 #ifdef CONFIG_SMP
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 782509012e3bc..2572fdcd9908d 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1013,11 +1013,7 @@ unsigned long sparc64_get_clock_tick(unsigned int cpu)
 
 	if (ft->clock_tick_ref)
 		return ft->clock_tick_ref;
-#ifdef CONFIG_SMP
 	return cpu_data(cpu).clock_tick;
-#else
-	return up_clock_tick;
-#endif
 }
 
 #ifdef CONFIG_CPU_FREQ
@@ -1029,7 +1025,6 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val
 	unsigned int cpu = freq->cpu;
 	struct freq_table *ft = &per_cpu(sparc64_freq_table, cpu);
 
-#ifdef CONFIG_SMP
 	if (!ft->ref_freq) {
 		ft->ref_freq = freq->old;
 		ft->udelay_val_ref = cpu_data(cpu).udelay_val;
@@ -1046,18 +1041,6 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val
 				      ft->ref_freq,
 				      freq->new);
 	}
-#else
-	/* In the non-SMP case, kernel/cpufreq.c takes care of adjusting
-	 * loops_per_jiffy.
-	 */
-	if (!ft->ref_freq) {
-		ft->ref_freq = freq->old;
-		ft->clock_tick_ref = up_clock_tick;
-	}
-	if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||
-	    (val == CPUFREQ_POSTCHANGE && freq->old > freq->new))
-		up_clock_tick = cpufreq_scale(ft->clock_tick_ref, ft->ref_freq, freq->new);
-#endif
 
 	return 0;
 }
diff --git a/include/asm-sparc64/timer.h b/include/asm-sparc64/timer.h
index 0910e9deea0d0..ba33a2b6b7bd7 100644
--- a/include/asm-sparc64/timer.h
+++ b/include/asm-sparc64/timer.h
@@ -69,10 +69,6 @@ struct pt_regs;
 extern void timer_tick_interrupt(struct pt_regs *);
 #endif
 
-#ifndef CONFIG_SMP
-extern unsigned long up_clock_tick;
-#endif
-
 extern unsigned long sparc64_get_clock_tick(unsigned int cpu);
 
 #endif /* _SPARC64_TIMER_H */
-- 
2.53.0