diff options
| author | Fabio Massimo Di Nitto <fabbione@ubuntu.com> | 2007-07-16 23:15:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-17 02:11:58 +0200 |
| commit | 3ac66e33eaf0b2313f7e3c8c023aa0420577a0c2 (patch) | |
| tree | d154a5d218c9946f0486391c2e99dae18bab0d03 | |
| parent | Make BLK_DEV_BSG depend strictly on SCSI=y (diff) | |
| download | linux-3ac66e33eaf0b2313f7e3c8c023aa0420577a0c2.tar.xz linux-3ac66e33eaf0b2313f7e3c8c023aa0420577a0c2.zip | |
[SPARC64]: SMP build fix.
The UP build fix had some unintended consequences.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc64/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index dc928e49e341..aafde3dd9fd4 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 |