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

Commit 416e2d63 authored by Jody Belka's avatar Jody Belka Committed by Ingo Molnar
Browse files

x86: fixup machine_ops reboot_{32|64}.c unification fallout 



When reboot_32.c and reboot_64.c were unified (commit 4d022e35...),
the machine_ops code was broken, leading to xen pvops kernels failing
to properly halt/poweroff/reboot etc. This fixes that up.

Signed-off-by: default avatarJody Belka <knew-linux@pimb.org>
Cc: Miguel Boton <mboton@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1cdde191

arch/x86/kernel/reboot.c

+36 −10
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ static inline void kb_wait(void) 
	}

}



void machine_emergency_restart(void)

static void native_machine_emergency_restart(void)

{

	int i;
@@ -376,7 +376,7 @@ void machine_emergency_restart(void) 
	}

}



void machine_shutdown(void)

static void native_machine_shutdown(void)

{

	/* Stop the cpus and apics */

#ifdef CONFIG_SMP
@@ -420,7 +420,7 @@ void machine_shutdown(void) 
#endif

}



void machine_restart(char *__unused)

static void native_machine_restart(char *__unused)

{

	printk("machine restart\n");
@@ -429,11 +429,11 @@ void machine_restart(char *__unused) 
	machine_emergency_restart();

}



void machine_halt(void)

static void native_machine_halt(void)

{

}



void machine_power_off(void)

static void native_machine_power_off(void)

{

	if (pm_power_off) {

		if (!reboot_force)
@@ -443,9 +443,35 @@ void machine_power_off(void) 
}



struct machine_ops machine_ops = {

	.power_off = machine_power_off,

	.shutdown = machine_shutdown,

	.emergency_restart = machine_emergency_restart,

	.restart = machine_restart,

	.halt = machine_halt

	.power_off = native_machine_power_off,

	.shutdown = native_machine_shutdown,

	.emergency_restart = native_machine_emergency_restart,

	.restart = native_machine_restart,

	.halt = native_machine_halt

};



void machine_power_off(void)

{

	machine_ops.power_off();

}



void machine_shutdown(void)

{

	machine_ops.shutdown();

}



void machine_emergency_restart(void)

{

	machine_ops.emergency_restart();

}



void machine_restart(char *cmd)

{

	machine_ops.restart(cmd);

}



void machine_halt(void)

{

	machine_ops.halt();

}