aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-11-10 06:18:18 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-01-27 23:18:43 -0500
commitc881cbc033c80d92d1bb7a0446735561a46e1f9c (patch)
tree37bad67e65f472f8b1b5e98eca9401e42745b7f2 /arch
parentcc8eae7f5190668337463d6bfba60c137bce0522 (diff)
sh: Don't reference UBC code in CPU init on sh64.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/kernel/cpu/init.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index c217c4bf0085..f37f1c031631 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -21,8 +21,10 @@
21#include <asm/cacheflush.h> 21#include <asm/cacheflush.h>
22#include <asm/cache.h> 22#include <asm/cache.h>
23#include <asm/io.h> 23#include <asm/io.h>
24#include <asm/ubc.h>
25#include <asm/smp.h> 24#include <asm/smp.h>
25#ifdef CONFIG_SUPERH32
26#include <asm/ubc.h>
27#endif
26 28
27/* 29/*
28 * Generic wrapper for command line arguments to disable on-chip 30 * Generic wrapper for command line arguments to disable on-chip
@@ -273,7 +275,10 @@ asmlinkage void __cpuinit sh_cpu_init(void)
273 * like PTRACE_SINGLESTEP or doing hardware watchpoints in GDB. So .. 275 * like PTRACE_SINGLESTEP or doing hardware watchpoints in GDB. So ..
274 * we wake it up and hope that all is well. 276 * we wake it up and hope that all is well.
275 */ 277 */
278#ifdef CONFIG_SUPERH32
276 if (raw_smp_processor_id() == 0) 279 if (raw_smp_processor_id() == 0)
277 ubc_wakeup(); 280 ubc_wakeup();
281#endif
282
278 speculative_execution_init(); 283 speculative_execution_init();
279} 284}