Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 16dcb4bbda579c4e3d80048b755ac124d8fab21a

Authored by Eric W. Biederman
Committed by Linus Torvalds
1 parent 7c9034735e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

arch/cris/kernel/process.c
Diff comments   View file @ 16dcb4b
... ... @@ -113,6 +113,7 @@
113 113 #include <linux/user.h>
114 114 #include <linux/elfcore.h>
115 115 #include <linux/mqueue.h>
  116 +#include <linux/reboot.h>
116 117  
117 118 //#define DEBUG
118 119  
... ... @@ -208,7 +209,7 @@
208 209  
209 210 void hard_reset_now (void);
210 211  
211   -void machine_restart(void)
  212 +void machine_restart(char *cmd)
212 213 {
213 214 hard_reset_now();
214 215 }