diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-04-20 23:20:42 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-04-20 23:20:42 -0400 |
commit | 4a6feab0ee5240c4bd5378d9f8a46b85718c68a7 (patch) | |
tree | 883f73dbb1e1ed80ae098b794d20ce1d09d1c88b /arch/sh/include | |
parent | a9079ca0cb15feda15e7a380092e02d5cd834148 (diff) |
sh: __cpuinit annotate the CPU init path.
All of the regular CPU init path needs to be __cpuinit annotated for CPU
hotplug.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r-- | arch/sh/include/asm/processor.h | 1 | ||||
-rw-r--r-- | arch/sh/include/asm/processor_32.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h index c2be22505fee..26b3f026eec9 100644 --- a/arch/sh/include/asm/processor.h +++ b/arch/sh/include/asm/processor.h | |||
@@ -102,6 +102,7 @@ struct task_struct; | |||
102 | 102 | ||
103 | extern struct pt_regs fake_swapper_regs; | 103 | extern struct pt_regs fake_swapper_regs; |
104 | 104 | ||
105 | extern void cpu_init(void); | ||
105 | extern void cpu_probe(void); | 106 | extern void cpu_probe(void); |
106 | 107 | ||
107 | /* arch/sh/kernel/process.c */ | 108 | /* arch/sh/kernel/process.c */ |
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h index 572b4eb09493..61a445d2d02a 100644 --- a/arch/sh/include/asm/processor_32.h +++ b/arch/sh/include/asm/processor_32.h | |||
@@ -27,8 +27,6 @@ | |||
27 | #define CCN_CVR 0xff000040 | 27 | #define CCN_CVR 0xff000040 |
28 | #define CCN_PRR 0xff000044 | 28 | #define CCN_PRR 0xff000044 |
29 | 29 | ||
30 | asmlinkage void __init sh_cpu_init(void); | ||
31 | |||
32 | /* | 30 | /* |
33 | * User space process size: 2GB. | 31 | * User space process size: 2GB. |
34 | * | 32 | * |