[XenPPC] [linux-ppc-2.6] [XEN][POWERPC] enable drivers/xen/core/reboot.c

[Xen patchbot-linux-ppc-2.6 <patchbot-linux-ppc-2.6@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
# Node ID 95979991fc4a977392ebb72c5c375d77bc86a0d8
# Parent  93507316d0a08aa566ceb1752f2b565ee1c384ad
[XEN][POWERPC] enable drivers/xen/core/reboot.c

but add some ifdefs in file to go around reboot and suspend, for now.

Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx>
---
 drivers/xen/Kconfig       |    1 -
 drivers/xen/core/reboot.c |   10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff -r 93507316d0a0 -r 95979991fc4a drivers/xen/Kconfig
--- a/drivers/xen/Kconfig       Mon Aug 28 15:10:14 2006 -0400
+++ b/drivers/xen/Kconfig       Mon Aug 28 15:55:04 2006 -0400
@@ -239,7 +239,6 @@ config XEN_SKBUFF
 
 config XEN_REBOOT
        bool
-       depends on !PPC_XEN
        default y
 
 config XEN_SMPBOOT
diff -r 93507316d0a0 -r 95979991fc4a drivers/xen/core/reboot.c
--- a/drivers/xen/core/reboot.c Mon Aug 28 15:10:14 2006 -0400
+++ b/drivers/xen/core/reboot.c Mon Aug 28 15:55:04 2006 -0400
@@ -39,6 +39,7 @@ extern void ctrl_alt_del(void);
  */
 #define SHUTDOWN_HALT      4
 
+#ifndef CONFIG_PPC_XEN
 void machine_emergency_restart(void)
 {
        /* We really want to get pending console data out before we die. */
@@ -72,6 +73,7 @@ EXPORT_SYMBOL(machine_halt);
 EXPORT_SYMBOL(machine_halt);
 EXPORT_SYMBOL(machine_power_off);
 
+#endif /* CONFIG_PPC_XEN */
 
 /******************************************************************************
  * Stop/pickle callback handling.
@@ -82,6 +84,7 @@ static void __shutdown_handler(void *unu
 static void __shutdown_handler(void *unused);
 static DECLARE_WORK(shutdown_work, __shutdown_handler, NULL);
 
+#ifndef CONFIG_PPC_XEN
 /* Ensure we run on the idle task page tables so that we will
    switch page tables before running user space. This is needed
    on architectures with separate kernel and user page tables
@@ -190,6 +193,13 @@ static int __do_suspend(void *ignore)
 
        return err;
 }
+#else  /* CONFIG_PPC_XEN */
+static int __do_suspend(void *ignore)
+{
+       printk("SUSPEND!!??\n");
+       return 0;
+}
+#endif  /* CONFIG_PPC_XEN */
 
 static int shutdown_process(void *__unused)
 {

_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel