good catch Jan! The patch below should fix it.
Can you see any other material difference due to the unification?
reboot_mode is now written to 0x472 unconditionally, but we can consider
that a bugfix. Otherwise the mode and ordering of reboot sequences seems
to be equivalent to me.
Ingo
------------------->
Subject: x86: re-add reboot fixups
From: Ingo Molnar <mingo@elte.hu>
Date: Thu Mar 06 18:29:43 CET 2008
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: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/reboot.c | 6 ++++++
1 file changed, 6 insertions(+)
Index: linux-x86.q/arch/x86/kernel/reboot.c
===================================================================
--- linux-x86.q.orig/arch/x86/kernel/reboot.c
+++ linux-x86.q/arch/x86/kernel/reboot.c
@@ -335,6 +335,10 @@ static inline void kb_wait(void)
}
}
+void __attribute__((weak)) mach_reboot_fixups(void)
+{
+}
+
void native_machine_emergency_restart(void)
{
int i;
@@ -342,6 +346,8 @@ void native_machine_emergency_restart(vo
/* Tell the BIOS if we want cold or warm reboot */
*((unsigned short *)__va(0x472)) = reboot_mode;
+ mach_reboot_fixups(); /* for board specific fixups */
+
for (;;) {
/* Could also try the reset bit in the Hammer NB */
switch (reboot_type) {
--
