xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[POWERPC] Move pSeries_mach_cpu_die() into platforms/pseries/hotplug-cpu.c

Browse Source 
Move pSeries_mach_cpu_die() into platforms/pseries/hotplug-cpu.c,
this allows rtas_stop_self() to be static so remove the prototype.

Wire up pSeries_mach_cpu_die() in the initcall, rather than statically
in setup.c, the initcall will still run prior to the cpu hotplug code
being callable, so there should be no change in behaviour.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Michael Ellerman
2006-12-05 17:52:37 +11:00
committed by Paul Mackerras
parent 0332c2d447
commit 04da6af960
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/powerpc/platforms/pseries/hotplug-cpu.c
View File

@@ -1,7 +1,8 @@
/*
* pseries CPU Hotplug infrastructure.
*
* Split out from arch/powerpc/kernel/rtas.c
* Split out from arch/powerpc/platforms/pseries/setup.c and
* arch/powerpc/kernel/rtas.c
*
* Peter Bergner, IBM March 2001.
* Copyright (C) 2001 IBM.
@@ -34,7 +35,7 @@ static struct rtas_args rtas_stop_self_args = {
.rets = &rtas_stop_self_args.args[0],
};
void rtas_stop_self(void)
static void rtas_stop_self(void)
{
struct rtas_args *args = &rtas_stop_self_args;
@@ -49,10 +50,23 @@ void rtas_stop_self(void)
panic("Alas, I survived.\n");
}
static void pSeries_mach_cpu_die(void)
{
local_irq_disable();
idle_task_exit();
xics_teardown_cpu(0);
rtas_stop_self();
/* Should never get here... */
BUG();
for(;;);
}
static int __init pseries_cpu_hotplug_init(void)
{
rtas_stop_self_args.token = rtas_token("stop-self");
ppc_md.cpu_die = pSeries_mach_cpu_die;
return 0;
}
arch_initcall(pseries_cpu_hotplug_init);