kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IA64] kexec: Move machine_shutdown from machine_kexec.c to process.c

Browse source 
This moves the ia64 implementation of machine_shutdown() from
machine_kexec.c to process.c, which is in keeping with the implelmentation
on other architectures, and seems like a much more appropriate home for it.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Horms 2007-02-05 13:49:10 -08:00 committed by Tony Luck
parent 9473252f20
commit c237508afa
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/ia64/kernel/machine_kexec.c
View file

@ -69,19 +69,6 @@ void machine_kexec_cleanup(struct kimage *image)
{ {
} }
void machine_shutdown(void)
{
#ifdef CONFIG_HOTPLUG_CPU
int cpu;
for_each_online_cpu(cpu) {
if (cpu != smp_processor_id())
cpu_down(cpu);
}
#endif
kexec_disable_iosapic();
}
/* /*
* Do not allocate memory (or fail in any way) in machine_kexec(). * Do not allocate memory (or fail in any way) in machine_kexec().
* We are past the point of no return, committed to rebooting now. * We are past the point of no return, committed to rebooting now.

16
arch/ia64/kernel/process.c
View file

@ -34,6 +34,7 @@
#include <asm/ia32.h> #include <asm/ia32.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/kdebug.h> #include <asm/kdebug.h>
#include <asm/kexec.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/sal.h> #include <asm/sal.h>
@ -803,6 +804,21 @@ cpu_halt (void)
ia64_pal_halt(min_power_state); ia64_pal_halt(min_power_state);
} }
void machine_shutdown(void)
{
#ifdef CONFIG_HOTPLUG_CPU
int cpu;
for_each_online_cpu(cpu) {
if (cpu != smp_processor_id())
cpu_down(cpu);
}
#endif
#ifdef CONFIG_KEXEC
kexec_disable_iosapic();
#endif
}
void void
machine_restart (char *restart_cmd) machine_restart (char *restart_cmd)
{ {