From 446251fc3862447d8d01e01a95b56f55785b470d Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 6 Mar 2008 18:29:43 +0100
Subject: [PATCH] --- yaml --- r: 87027 b: refs/heads/master c:
 7432d149fda8ce9ead9df91e577b83ce52ad5f65 h: refs/heads/master i:   87025:
 a13f7592608c64eab62508739da98fa8ed46063f   87023:
 c47fe67e616eeb32c7cb99021e1b3556bd88c7d1 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/reboot.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 28ae1e55a977..8706731f53c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d032b31a3a22a571cb50c0b5dffbe9ba9328d6e2
+refs/heads/master: 7432d149fda8ce9ead9df91e577b83ce52ad5f65
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
index 7fd6ac43e4a1..55ceb8cdef75 100644
--- a/trunk/arch/x86/kernel/reboot.c
+++ b/trunk/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);