Skip to content

Commit

Permalink
x86: allow machine_crash_shutdown to be replaced
Browse files Browse the repository at this point in the history
This patch a llows machine_crash_shutdown to
be replaced, just like any of the other functions
in machine_ops

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
  • Loading branch information
Glauber Costa authored and Avi Kivity committed Apr 27, 2008
1 parent 096d14a commit ed23dc6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 2 additions & 1 deletion arch/x86/kernel/crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <asm/hpet.h>
#include <linux/kdebug.h>
#include <asm/smp.h>
#include <asm/reboot.h>

#include <mach_ipi.h>

Expand Down Expand Up @@ -117,7 +118,7 @@ static void nmi_shootdown_cpus(void)
}
#endif

void machine_crash_shutdown(struct pt_regs *regs)
void native_machine_crash_shutdown(struct pt_regs *regs)
{
/* This function is only called after the system
* has panicked or is otherwise in a critical state.
Expand Down
11 changes: 10 additions & 1 deletion arch/x86/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,10 @@ struct machine_ops machine_ops = {
.shutdown = native_machine_shutdown,
.emergency_restart = native_machine_emergency_restart,
.restart = native_machine_restart,
.halt = native_machine_halt
.halt = native_machine_halt,
#ifdef CONFIG_KEXEC
.crash_shutdown = native_machine_crash_shutdown,
#endif
};

void machine_power_off(void)
Expand Down Expand Up @@ -498,3 +501,9 @@ void machine_halt(void)
machine_ops.halt();
}

#ifdef CONFIG_KEXEC
void machine_crash_shutdown(struct pt_regs *regs)
{
machine_ops.crash_shutdown(regs);
}
#endif
1 change: 1 addition & 0 deletions include/asm-x86/reboot.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ struct machine_ops {
extern struct machine_ops machine_ops;

void machine_real_restart(unsigned char *code, int length);
void native_machine_crash_shutdown(struct pt_regs *regs);

#endif /* _ASM_REBOOT_H */

0 comments on commit ed23dc6

Please sign in to comment.