diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts_initrd.c | 3 | ||||
-rw-r--r-- | init/main.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index a06f037fa000..919a80cb322e 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c | |||
@@ -1,4 +1,3 @@ | |||
1 | #define __KERNEL_SYSCALLS__ | ||
2 | #include <linux/unistd.h> | 1 | #include <linux/unistd.h> |
3 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
4 | #include <linux/fs.h> | 3 | #include <linux/fs.h> |
@@ -35,7 +34,7 @@ static int __init do_linuxrc(void * shell) | |||
35 | (void) sys_open("/dev/console",O_RDWR,0); | 34 | (void) sys_open("/dev/console",O_RDWR,0); |
36 | (void) sys_dup(0); | 35 | (void) sys_dup(0); |
37 | (void) sys_dup(0); | 36 | (void) sys_dup(0); |
38 | return execve(shell, argv, envp_init); | 37 | return kernel_execve(shell, argv, envp_init); |
39 | } | 38 | } |
40 | 39 | ||
41 | static void __init handle_initrd(void) | 40 | static void __init handle_initrd(void) |
diff --git a/init/main.c b/init/main.c index 0766e69712b2..a49b00235bda 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -9,8 +9,6 @@ | |||
9 | * Simplified starting of init: Michael A. Griffith <grif@acm.org> | 9 | * Simplified starting of init: Michael A. Griffith <grif@acm.org> |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #define __KERNEL_SYSCALLS__ | ||
13 | |||
14 | #include <linux/types.h> | 12 | #include <linux/types.h> |
15 | #include <linux/module.h> | 13 | #include <linux/module.h> |
16 | #include <linux/proc_fs.h> | 14 | #include <linux/proc_fs.h> |
@@ -703,7 +701,7 @@ static void do_pre_smp_initcalls(void) | |||
703 | static void run_init_process(char *init_filename) | 701 | static void run_init_process(char *init_filename) |
704 | { | 702 | { |
705 | argv_init[0] = init_filename; | 703 | argv_init[0] = init_filename; |
706 | execve(init_filename, argv_init, envp_init); | 704 | kernel_execve(init_filename, argv_init, envp_init); |
707 | } | 705 | } |
708 | 706 | ||
709 | static int init(void * unused) | 707 | static int init(void * unused) |