diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-03-06 18:29:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-03-07 16:39:14 +0100 |
| commit | 7432d149fda8ce9ead9df91e577b83ce52ad5f65 (patch) | |
| tree | 2c382b3c4073d560eebfa743d4925246f430f95f /arch | |
| parent | d032b31a3a22a571cb50c0b5dffbe9ba9328d6e2 (diff) | |
| download | linux-3.10-7432d149fda8ce9ead9df91e577b83ce52ad5f65.tar.gz linux-3.10-7432d149fda8ce9ead9df91e577b83ce52ad5f65.tar.bz2 linux-3.10-7432d149fda8ce9ead9df91e577b83ce52ad5f65.zip | |
x86: re-add reboot fixups
Jan Beulich noticed that the reboot fixups went missing during
reboot.c unification.
(commit 4d022e35fd7e07c522c7863fee6f07e53cf3fc14)
Geode and a few other rare boards with special reboot quirks are
affected.
Reported-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -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 7fd6ac43e4a..55ceb8cdef7 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); |