aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc64
diff options
context:
space:
mode:
authorFabio Massimo Di Nitto <fabbione@ubuntu.com>2007-07-16 14:15:39 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-16 17:11:58 -0700
commit3ac66e33eaf0b2313f7e3c8c023aa0420577a0c2 (patch)
treed154a5d218c9946f0486391c2e99dae18bab0d03 /arch/sparc64
parent29417b899a77aaba1c060f5e123db4f50006f58a (diff)
downloadlinux-2.6.34-ux500-3ac66e33eaf0b2313f7e3c8c023aa0420577a0c2.tar.gz
[SPARC64]: SMP build fix.
The UP build fix had some unintended consequences. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index dc928e49e34..aafde3dd9fd 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -454,9 +454,9 @@ static int show_cpuinfo(struct seq_file *m, void *__unused)
ncpus_probed,
num_online_cpus(),
dcache_parity_tl1_occurred,
- icache_parity_tl1_occurred,
+ icache_parity_tl1_occurred
#ifndef CONFIG_SMP
- cpu_data(0).clock_tick
+ , cpu_data(0).clock_tick
#endif
);
#ifdef CONFIG_SMP