ia64/xen-unstable

changeset 8509:ba4d42f18661

Move definition of pm_power_off to a more sensible location.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Fri Jan 06 12:59:55 2006 +0100 (2006-01-06)
parents dd5649730b32
children 01a854cd8848
files linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Fri Jan 06 12:53:19 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/acpi/boot.c	Fri Jan 06 12:59:55 2006 +0100
     1.3 @@ -40,8 +40,6 @@
     1.4  #include <asm/fixmap.h>
     1.5  #endif
     1.6  
     1.7 -void (*pm_power_off)(void) = NULL;
     1.8 -
     1.9  #ifdef	CONFIG_X86_64
    1.10  
    1.11  static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Fri Jan 06 12:53:19 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Fri Jan 06 12:59:55 2006 +0100
     2.3 @@ -17,6 +17,13 @@
     2.4  #include <linux/kthread.h>
     2.5  #include <asm-xen/xencons.h>
     2.6  
     2.7 +#if defined(__i386__) || defined(__x86_64__)
     2.8 +/*
     2.9 + * Power off function, if any
    2.10 + */
    2.11 +void (*pm_power_off)(void);
    2.12 +#endif
    2.13 +
    2.14  #define SHUTDOWN_INVALID  -1
    2.15  #define SHUTDOWN_POWEROFF  0
    2.16  #define SHUTDOWN_REBOOT    1