summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-07-26 19:32:34 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-26 23:35:42 +0200
commit16dcb4bbda579c4e3d80048b755ac124d8fab21a (patch)
treec0195fc6f371190fe15a28d752caaf2b02de9468
parent[PATCH] Add emergency_restart() (diff)
downloadlinux-16dcb4bbda579c4e3d80048b755ac124d8fab21a.tar.xz
linux-16dcb4bbda579c4e3d80048b755ac124d8fab21a.zip
[PATCH] Fix the arguments to machine_restart on cris
It appears machine_restart has been working cris just by luck. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/cris/kernel/process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 9f7cad7c7849..7645c4d4de6f 100644
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -113,6 +113,7 @@
#include <linux/user.h>
#include <linux/elfcore.h>
#include <linux/mqueue.h>
+#include <linux/reboot.h>
//#define DEBUG
@@ -208,7 +209,7 @@ void cpu_idle (void)
void hard_reset_now (void);
-void machine_restart(void)
+void machine_restart(char *cmd)
{
hard_reset_now();
}