diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2007-11-10 20:18:18 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 13:18:43 +0900 |
| commit | c881cbc033c80d92d1bb7a0446735561a46e1f9c (patch) | |
| tree | 37bad67e65f472f8b1b5e98eca9401e42745b7f2 /arch/sh/kernel | |
| parent | sh: imask IRQ depends on sh32. (diff) | |
| download | linux-dev-c881cbc033c80d92d1bb7a0446735561a46e1f9c.tar.xz linux-dev-c881cbc033c80d92d1bb7a0446735561a46e1f9c.zip | |
sh: Don't reference UBC code in CPU init on sh64.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/cpu/init.c | 7 |
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 @@ #include <asm/cacheflush.h> #include <asm/cache.h> #include <asm/io.h> -#include <asm/ubc.h> #include <asm/smp.h> +#ifdef CONFIG_SUPERH32 +#include <asm/ubc.h> +#endif /* * Generic wrapper for command line arguments to disable on-chip @@ -273,7 +275,10 @@ asmlinkage void __cpuinit sh_cpu_init(void) * like PTRACE_SINGLESTEP or doing hardware watchpoints in GDB. So .. * we wake it up and hope that all is well. */ +#ifdef CONFIG_SUPERH32 if (raw_smp_processor_id() == 0) ubc_wakeup(); +#endif + speculative_execution_init(); } |