[PATCH] fix voyager compile after machine_emergency_restart breakage

[PATCH] fix voyager compile after machine_emergency_restart breakage

[James Bottomley]

[PATCH] i386: Implement machine_emergency_reboot

introduced this new function into arch/i386/reboot.c.  However,
subarchitectures are entitled to implement their own copies of reboot.c
from which this new function is now missing.

It looks like visws will also need a similar fixup

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -279,6 +279,13 @@ machine_restart(char *cmd)
 }
 
 void
+machine_emergency_restart(void)
+{
+	/*for now, just hook this to a warm restart */
+	machine_restart(NULL);
+}
+
+void
 mca_nmi_hook(void)
 {
 	__u8 dumpval __attribute__((unused)) = inb(0xf823);

Re: [PATCH] fix voyager compile after machine_emergency_restart breakage

[Eric W. Biederman]

James Bottomley <James.Bottomley@SteelEye.com> writes:

> [PATCH] i386: Implement machine_emergency_reboot
>
> introduced this new function into arch/i386/reboot.c.  However,
> subarchitectures are entitled to implement their own copies of reboot.c
> from which this new function is now missing.
>
> It looks like visws will also need a similar fixup

Yes, except it looks like it can benefit from a real
machine_emergency_restart, if the smp_send_stop in
there is the one I am familiar with.

My apologies I am always finding the subarchitecture support
on x86 non-intuitive.  When you are looking at the primary
code path there is nothing to indicate that there is
a secondary code path out in the machine specific files.
Most other architectures have a machine vector so
you can compile for multiple subarchitectures simultaneously
and then switch between them, at run time.  With an optimization
that if you only compile for one subarchitecture the indirect
function call overhead disappears. 

Anyway I will see about generating the trivial patch later today.

Eric

[PATCH] i386 voyager: Add machine_shutdown

[Eric W. Biederman]

Here is one more bit of breakage my x86 sub-architecture
confusion caused.

Add machine_shutdown to voyager so it will compile with CONFIG_KEXEC.
---

 arch/i386/mach-voyager/voyager_basic.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

9c3d47fbd4a3c909f98de100e05f53301833128e
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -252,6 +252,12 @@ kb_wait(void)
 }
 
 void
+machine_shutdown(void)
+{
+	/* Architecture specific shutdown needed before a kexec */
+}
+
+void
 machine_restart(char *cmd)
 {
 	printk("Voyager Warm Restart\n");