Skip to content

Commit

Permalink
[IA64] kexec: Move machine_shutdown from machine_kexec.c to process.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Horms authored and Tony Luck committed Feb 5, 2007
1 parent 9473252 commit c237508
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
13 changes: 0 additions & 13 deletions arch/ia64/kernel/machine_kexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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().
* We are past the point of no return, committed to rebooting now.
Expand Down
16 changes: 16 additions & 0 deletions arch/ia64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <asm/ia32.h>
#include <asm/irq.h>
#include <asm/kdebug.h>
#include <asm/kexec.h>
#include <asm/pgalloc.h>
#include <asm/processor.h>
#include <asm/sal.h>
Expand Down Expand Up @@ -803,6 +804,21 @@ cpu_halt (void)
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
machine_restart (char *restart_cmd)
{
Expand Down

0 comments on commit c237508

Please sign in to comment.