diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
| commit | 98d350cf7ae077eb8083ccc7c1bfc838344ac590 (patch) | |
| tree | dfee7af0eff981b941db6bdbd1d5f039f9f85407 /arch/sparc/kernel/process_64.c | |
| parent | a10d60c08cc3bbea9195e2b36440f557373623eb (diff) | |
| parent | 0bdb3ccd02509a4380d54efd85effc6a9902d4fd (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/kernel/process_64.c')
| -rw-r--r-- | arch/sparc/kernel/process_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index d7b4967f8fa6..b2988f25e230 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c @@ -88,7 +88,7 @@ void arch_cpu_idle(void) } #ifdef CONFIG_HOTPLUG_CPU -void arch_cpu_idle_dead() +void arch_cpu_idle_dead(void) { sched_preempt_enable_no_resched(); cpu_play_dead(); |