# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1189439480 -3600
# Node ID 1c85fe14169f4de73be50604cb6d5b50bec48e6b
# Parent e3984b0b81f521eee680162483abba11c5f8ddcd
Change prototype of machine_restart to void machine_restart(void).
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/ia64/xen/domain.c | 2 +-
xen/arch/powerpc/domain.c | 2 +-
xen/arch/x86/shutdown.c | 2 +-
xen/common/keyhandler.c | 2 +-
xen/common/shutdown.c | 4 ++--
xen/drivers/char/console.c | 2 +-
xen/include/xen/shutdown.h | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff -r e3984b0b81f5 -r 1c85fe14169f xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Mon Sep 10 16:13:35 2007 +0100
+++ b/xen/arch/ia64/xen/domain.c Mon Sep 10 16:51:20 2007 +0100
@@ -1486,7 +1486,7 @@ int __init construct_dom0(struct domain
return 0;
}
-void machine_restart(char * __unused)
+void machine_restart(void)
{
console_start_sync();
if (running_on_sim)
diff -r e3984b0b81f5 -r 1c85fe14169f xen/arch/powerpc/domain.c
--- a/xen/arch/powerpc/domain.c Mon Sep 10 16:13:35 2007 +0100
+++ b/xen/arch/powerpc/domain.c Mon Sep 10 16:51:20 2007 +0100
@@ -119,7 +119,7 @@ void machine_halt(void)
machine_fail(__func__);
}
-void machine_restart(char * __unused)
+void machine_restart(void)
{
console_start_sync();
printk("%s called\n", __func__);
diff -r e3984b0b81f5 -r 1c85fe14169f xen/arch/x86/shutdown.c
--- a/xen/arch/x86/shutdown.c Mon Sep 10 16:13:35 2007 +0100
+++ b/xen/arch/x86/shutdown.c Mon Sep 10 16:51:20 2007 +0100
@@ -197,7 +197,7 @@ static void machine_real_restart(const u
#endif
-void machine_restart(char *cmd)
+void machine_restart(void)
{
int i;
diff -r e3984b0b81f5 -r 1c85fe14169f xen/common/keyhandler.c
--- a/xen/common/keyhandler.c Mon Sep 10 16:13:35 2007 +0100
+++ b/xen/common/keyhandler.c Mon Sep 10 16:51:20 2007 +0100
@@ -123,7 +123,7 @@ static void halt_machine(unsigned char k
static void halt_machine(unsigned char key, struct cpu_user_regs *regs)
{
printk("'%c' pressed -> rebooting machine\n", key);
- machine_restart(NULL);
+ machine_restart();
}
static void cpuset_print(char *set, int size, cpumask_t mask)
diff -r e3984b0b81f5 -r 1c85fe14169f xen/common/shutdown.c
--- a/xen/common/shutdown.c Mon Sep 10 16:13:35 2007 +0100
+++ b/xen/common/shutdown.c Mon Sep 10 16:51:20 2007 +0100
@@ -24,7 +24,7 @@ static void maybe_reboot(void)
printk("rebooting machine in 5 seconds.\n");
watchdog_disable();
mdelay(5000);
- machine_restart(NULL);
+ machine_restart();
}
}
@@ -50,7 +50,7 @@ void dom0_shutdown(u8 reason)
case SHUTDOWN_reboot:
{
printk("Domain 0 shutdown: rebooting machine.\n");
- machine_restart(NULL);
+ machine_restart();
break; /* not reached */
}
diff -r e3984b0b81f5 -r 1c85fe14169f xen/drivers/char/console.c
--- a/xen/drivers/char/console.c Mon Sep 10 16:13:35 2007 +0100
+++ b/xen/drivers/char/console.c Mon Sep 10 16:51:20 2007 +0100
@@ -895,7 +895,7 @@ void panic(const char *fmt, ...)
{
watchdog_disable();
mdelay(5000);
- machine_restart(NULL);
+ machine_restart();
}
}
diff -r e3984b0b81f5 -r 1c85fe14169f xen/include/xen/shutdown.h
--- a/xen/include/xen/shutdown.h Mon Sep 10 16:13:35 2007 +0100
+++ b/xen/include/xen/shutdown.h Mon Sep 10 16:51:20 2007 +0100
@@ -6,7 +6,7 @@ extern int opt_noreboot;
void dom0_shutdown(u8 reason);
-void machine_restart(char *cmd);
+void machine_restart(void);
void machine_halt(void);
void machine_power_off(void);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home