aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sbus')
-rw-r--r--drivers/sbus/char/bbc_envctrl.c4
-rw-r--r--drivers/sbus/char/envctrl.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index 0d3660c28f7d..a54e4140683a 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -5,8 +5,8 @@
5 */ 5 */
6 6
7#include <linux/kthread.h> 7#include <linux/kthread.h>
8#include <linux/syscalls.h>
9#include <linux/delay.h> 8#include <linux/delay.h>
9#include <linux/kmod.h>
10#include <asm/oplib.h> 10#include <asm/oplib.h>
11#include <asm/ebus.h> 11#include <asm/ebus.h>
12 12
@@ -195,7 +195,7 @@ static void do_envctrl_shutdown(struct bbc_cpu_temperature *tp)
195 printk(KERN_CRIT "kenvctrld: Shutting down the system now.\n"); 195 printk(KERN_CRIT "kenvctrld: Shutting down the system now.\n");
196 196
197 shutting_down = 1; 197 shutting_down = 1;
198 if (kernel_execve("/sbin/shutdown", argv, envp) < 0) 198 if (call_usermodehelper("/sbin/shutdown", argv, envp, 0) < 0)
199 printk(KERN_CRIT "envctrl: shutdown execution failed\n"); 199 printk(KERN_CRIT "envctrl: shutdown execution failed\n");
200} 200}
201 201
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 6b6a855f3795..fff4660cdf96 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -25,7 +25,7 @@
25#include <linux/delay.h> 25#include <linux/delay.h>
26#include <linux/ioport.h> 26#include <linux/ioport.h>
27#include <linux/miscdevice.h> 27#include <linux/miscdevice.h>
28#include <linux/syscalls.h> 28#include <linux/kmod.h>
29 29
30#include <asm/ebus.h> 30#include <asm/ebus.h>
31#include <asm/uaccess.h> 31#include <asm/uaccess.h>
@@ -976,7 +976,7 @@ static void envctrl_do_shutdown(void)
976 976
977 inprog = 1; 977 inprog = 1;
978 printk(KERN_CRIT "kenvctrld: WARNING: Shutting down the system now.\n"); 978 printk(KERN_CRIT "kenvctrld: WARNING: Shutting down the system now.\n");
979 ret = kernel_execve("/sbin/shutdown", argv, envp); 979 ret = call_usermodehelper("/sbin/shutdown", argv, envp, 0);
980 if (ret < 0) { 980 if (ret < 0) {
981 printk(KERN_CRIT "kenvctrld: WARNING: system shutdown failed!\n"); 981 printk(KERN_CRIT "kenvctrld: WARNING: system shutdown failed!\n");
982 inprog = 0; /* unlikely to succeed, but we could try again */ 982 inprog = 0; /* unlikely to succeed, but we could try again */