diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-07 10:05:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-07 10:05:57 -0800 |
| commit | 0a9e0703497013cf7a21455e51face5f048a187f (patch) | |
| tree | ac993e01bf9e220fe4e62c1e2a8e5c19b4c17f67 /arch/x86/kernel/reboot.c | |
| parent | 80d38f9a7871d9bafc3f244dabe48b41a58de705 (diff) | |
| parent | 1722770f131bb5c8e238825f3eba2efa331483a2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86-boot: don't request VBE2 information
x86: re-add reboot fixups
x86: fix typo in step.c
x86: fix merge mistake in i387.c
x86: clear DF before calling signal handler
Diffstat (limited to 'arch/x86/kernel/reboot.c')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 7fd6ac43e4a1..55ceb8cdef75 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -326,6 +326,10 @@ static inline void kb_wait(void) } } +void __attribute__((weak)) mach_reboot_fixups(void) +{ +} + static void native_machine_emergency_restart(void) { int i; @@ -337,6 +341,8 @@ static void native_machine_emergency_restart(void) /* Could also try the reset bit in the Hammer NB */ switch (reboot_type) { case BOOT_KBD: + mach_reboot_fixups(); /* for board specific fixups */ + for (i = 0; i < 10; i++) { kb_wait(); udelay(50); |