ia64/xen-unstable

changeset 6040:5a33233a608e

No need to define errno defined at the top of reboot.c.
err2 is only needed when CONFIG_MAGIC_SYSRQ is defined.

Signed-off-by: Li Xin <xin.b.li@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Aug 05 09:53:04 2005 +0000 (2005-08-05)
parents 9faafa21bf98
children b63577ff53a3
files linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Fri Aug 05 09:04:01 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Fri Aug 05 09:53:04 2005 +0000
     1.3 @@ -1,7 +1,4 @@
     1.4 -
     1.5  #define __KERNEL_SYSCALLS__
     1.6 -static int errno;
     1.7 -#include <linux/errno.h>
     1.8  #include <linux/version.h>
     1.9  #include <linux/kernel.h>
    1.10  #include <linux/mm.h>
    1.11 @@ -309,7 +306,10 @@ static int setup_shutdown_watcher(struct
    1.12                                    unsigned long event,
    1.13                                    void *data)
    1.14  {
    1.15 -    int err1=0, err2=0;
    1.16 +    int err1 = 0;
    1.17 +#ifdef CONFIG_MAGIC_SYSRQ
    1.18 +    int err2 = 0;
    1.19 +#endif
    1.20  
    1.21      down(&xenbus_lock);
    1.22      err1 = register_xenbus_watch(&shutdown_watch);