Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c237508a authored by Horms's avatar Horms Committed by Tony Luck
Browse files

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



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: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 9473252f

arch/ia64/kernel/machine_kexec.c

+0 −13
Original line number Diff line number Diff line
@@ -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.

arch/ia64/kernel/process.c

+16 −0
Original line number Diff line number Diff line
@@ -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>
@@ -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)

{