x86: fixup machine_ops reboot_{32|64}.c unification fallout
PATCH 1/1 x86: fixup machine_ops reboot_{32|64}.c unification fallout
Please cc on any replies, thanks.
---
When reboot_32.c and reboot_64.c were unified (commit 4d022e35fd...), 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 Jody Belka <[email protected]>
--- arch/x86/kernel/reboot.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-)
arch/x86/kernel/reboot.c +36 -10
@@ -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 (); +} +
Signature · 1 line
1.5.2.5
Quoted 5 lines · Jody Belka
Please cc on any replies, thanks.
---
Whenreboot_32.candreboot_64.cwere unified (commit4d022e35fd...), themachine_opscode was broken, leading to xen pvops kernels failing to properly halt/poweroff/reboot etc. This fixes that up.
thanks Jody, applied.
Ingo