ia64/xen-unstable

changeset 15866:1c85fe14169f

Change prototype of machine_restart to void machine_restart(void).
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Mon Sep 10 16:51:20 2007 +0100 (2007-09-10)
parents e3984b0b81f5
children aaae02dbe269
files xen/arch/ia64/xen/domain.c xen/arch/powerpc/domain.c xen/arch/x86/shutdown.c xen/common/keyhandler.c xen/common/shutdown.c xen/drivers/char/console.c xen/include/xen/shutdown.h
line diff
     1.1 --- a/xen/arch/ia64/xen/domain.c	Mon Sep 10 16:13:35 2007 +0100
     1.2 +++ b/xen/arch/ia64/xen/domain.c	Mon Sep 10 16:51:20 2007 +0100
     1.3 @@ -1486,7 +1486,7 @@ int __init construct_dom0(struct domain 
     1.4  	return 0;
     1.5  }
     1.6  
     1.7 -void machine_restart(char * __unused)
     1.8 +void machine_restart(void)
     1.9  {
    1.10  	console_start_sync();
    1.11  	if (running_on_sim)
     2.1 --- a/xen/arch/powerpc/domain.c	Mon Sep 10 16:13:35 2007 +0100
     2.2 +++ b/xen/arch/powerpc/domain.c	Mon Sep 10 16:51:20 2007 +0100
     2.3 @@ -119,7 +119,7 @@ void machine_halt(void)
     2.4      machine_fail(__func__);
     2.5  }
     2.6  
     2.7 -void machine_restart(char * __unused)
     2.8 +void machine_restart(void)
     2.9  {
    2.10      console_start_sync();
    2.11      printk("%s called\n", __func__);
     3.1 --- a/xen/arch/x86/shutdown.c	Mon Sep 10 16:13:35 2007 +0100
     3.2 +++ b/xen/arch/x86/shutdown.c	Mon Sep 10 16:51:20 2007 +0100
     3.3 @@ -197,7 +197,7 @@ static void machine_real_restart(const u
     3.4  
     3.5  #endif
     3.6  
     3.7 -void machine_restart(char *cmd)
     3.8 +void machine_restart(void)
     3.9  {
    3.10      int i;
    3.11  
     4.1 --- a/xen/common/keyhandler.c	Mon Sep 10 16:13:35 2007 +0100
     4.2 +++ b/xen/common/keyhandler.c	Mon Sep 10 16:51:20 2007 +0100
     4.3 @@ -123,7 +123,7 @@ static void dump_registers(unsigned char
     4.4  static void halt_machine(unsigned char key, struct cpu_user_regs *regs)
     4.5  {
     4.6      printk("'%c' pressed -> rebooting machine\n", key);
     4.7 -    machine_restart(NULL);
     4.8 +    machine_restart();
     4.9  }
    4.10  
    4.11  static void cpuset_print(char *set, int size, cpumask_t mask)
     5.1 --- a/xen/common/shutdown.c	Mon Sep 10 16:13:35 2007 +0100
     5.2 +++ b/xen/common/shutdown.c	Mon Sep 10 16:51:20 2007 +0100
     5.3 @@ -24,7 +24,7 @@ static void maybe_reboot(void)
     5.4          printk("rebooting machine in 5 seconds.\n");
     5.5          watchdog_disable();
     5.6          mdelay(5000);
     5.7 -        machine_restart(NULL);
     5.8 +        machine_restart();
     5.9      }
    5.10  }
    5.11  
    5.12 @@ -50,7 +50,7 @@ void dom0_shutdown(u8 reason)
    5.13      case SHUTDOWN_reboot:
    5.14      {
    5.15          printk("Domain 0 shutdown: rebooting machine.\n");
    5.16 -        machine_restart(NULL);
    5.17 +        machine_restart();
    5.18          break; /* not reached */
    5.19      }
    5.20  
     6.1 --- a/xen/drivers/char/console.c	Mon Sep 10 16:13:35 2007 +0100
     6.2 +++ b/xen/drivers/char/console.c	Mon Sep 10 16:51:20 2007 +0100
     6.3 @@ -895,7 +895,7 @@ void panic(const char *fmt, ...)
     6.4      {
     6.5          watchdog_disable();
     6.6          mdelay(5000);
     6.7 -        machine_restart(NULL);
     6.8 +        machine_restart();
     6.9      }
    6.10  }
    6.11  
     7.1 --- a/xen/include/xen/shutdown.h	Mon Sep 10 16:13:35 2007 +0100
     7.2 +++ b/xen/include/xen/shutdown.h	Mon Sep 10 16:51:20 2007 +0100
     7.3 @@ -6,7 +6,7 @@ extern int opt_noreboot;
     7.4  
     7.5  void dom0_shutdown(u8 reason);
     7.6  
     7.7 -void machine_restart(char *cmd);
     7.8 +void machine_restart(void);
     7.9  void machine_halt(void);
    7.10  void machine_power_off(void);
    7.11