From: Fabio Massimo Di Nitto <fabbione@ubuntu.com>
Date: Mon, 16 Jul 2007 21:15:39 +0000 (-0700)
Subject: [SPARC64]: SMP build fix.
X-Git-Tag: v2.6.23-rc1~769^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3ac66e33eaf0b2313f7e3c8c023aa0420577a0c2;p=linux-2.6-omap-h63xx.git

[SPARC64]: SMP build fix.

The UP build fix had some unintended consequences.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

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