]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 29417b8)
[SPARC64]: SMP build fix.
authorFabio Massimo Di Nitto <fabbione@ubuntu.com>
Mon, 16 Jul 2007 21:15:39 +0000 (14:15 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 17 Jul 2007 00:11:58 +0000 (17:11 -0700)
The UP build fix had some unintended consequences.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/setup.c patch | blob | history

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index dc928e49e341aa5e6a7127db941e9bf8d58fd838..aafde3dd9fd4996af17f88f4d486aec214cdfe63 100644 (file)
--- 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
Linux 2.6 source tree