diff options
| author | H. Peter Anvin | 2011-02-15 03:36:03 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2011-02-18 06:05:34 +0100 |
| commit | 3d35ac346e981162eeba391e496faceed4753e7b (patch) | |
| tree | 1f902bd0b8d62aa65b9d216483cbecc9a712a72b /arch/x86/include/asm/reboot.h | |
| parent | x86: Make the GDT_ENTRY() macro in <asm/segment.h> safe for assembly (diff) | |
| download | kernel-qcow2-linux-3d35ac346e981162eeba391e496faceed4753e7b.tar.gz kernel-qcow2-linux-3d35ac346e981162eeba391e496faceed4753e7b.tar.xz kernel-qcow2-linux-3d35ac346e981162eeba391e496faceed4753e7b.zip | |
x86, reboot: Move the real-mode reboot code to an assembly file
Move the real-mode reboot code out to an assembly file (reboot_32.S)
which is allocated using the common lowmem trampoline allocator.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <4D5DFBE4.7090104@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Matthieu Castet <castet.matthieu@free.fr>
Diffstat (limited to 'arch/x86/include/asm/reboot.h')
| -rw-r--r-- | arch/x86/include/asm/reboot.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index 562d4fd31ba8..3250e3d605d9 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -18,7 +18,10 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); void native_machine_shutdown(void); -void machine_real_restart(const unsigned char *code, int length); +void machine_real_restart(unsigned int type); +/* These must match dispatch_table in reboot_32.S */ +#define MRR_BIOS 0 +#define MRR_APM 1 typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); |