From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 6 Mar 2008 17:29:43 +0000 (+0100)
Subject: x86: re-add reboot fixups
X-Git-Tag: v2.6.25-rc5~14^2~1
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=7432d149fda8ce9ead9df91e577b83ce52ad5f65;hp=d032b31a3a22a571cb50c0b5dffbe9ba9328d6e2;p=safe%2Fjmp%2Flinux-2.6

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>
---

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 7fd6ac4..55ceb8c 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);