diff options
| -rw-r--r-- | arch/sh/kernel/idle.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/perf_event.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index 0fd7b41f0a22..273f890b17ae 100644 --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c | |||
| @@ -112,7 +112,7 @@ void cpu_idle(void) | |||
| 112 | } | 112 | } |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | void __cpuinit select_idle_routine(void) | 115 | void __init select_idle_routine(void) |
| 116 | { | 116 | { |
| 117 | /* | 117 | /* |
| 118 | * If a platform has set its own idle routine, leave it alone. | 118 | * If a platform has set its own idle routine, leave it alone. |
diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c index 9f253e9cce01..81b6de41ae5d 100644 --- a/arch/sh/kernel/perf_event.c +++ b/arch/sh/kernel/perf_event.c | |||
| @@ -315,7 +315,7 @@ void hw_perf_disable(void) | |||
| 315 | sh_pmu->disable_all(); | 315 | sh_pmu->disable_all(); |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | int register_sh_pmu(struct sh_pmu *pmu) | 318 | int __cpuinit register_sh_pmu(struct sh_pmu *pmu) |
| 319 | { | 319 | { |
| 320 | if (sh_pmu) | 320 | if (sh_pmu) |
| 321 | return -EBUSY; | 321 | return -EBUSY; |
