projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'syscalls-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...
[linux-2.6-microblaze.git]
/
init
/
main.c
diff --git
a/init/main.c
b/init/main.c
index
21efbf6
..
e4a3160
100644
(file)
--- a/
init/main.c
+++ b/
init/main.c
@@
-1074,11
+1074,11
@@
static noinline void __init kernel_init_freeable(void)
do_basic_setup();
/* Open the /dev/console on the rootfs, this should never fail */
do_basic_setup();
/* Open the /dev/console on the rootfs, this should never fail */
- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
+ if (
k
sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
pr_err("Warning: unable to open an initial console.\n");
pr_err("Warning: unable to open an initial console.\n");
- (void) sys_dup(0);
- (void) sys_dup(0);
+ (void)
k
sys_dup(0);
+ (void)
k
sys_dup(0);
/*
* check if there is an early userspace init. If yes, let it do all
* the work
/*
* check if there is an early userspace init. If yes, let it do all
* the work
@@
-1087,7
+1087,8
@@
static noinline void __init kernel_init_freeable(void)
if (!ramdisk_execute_command)
ramdisk_execute_command = "/init";
if (!ramdisk_execute_command)
ramdisk_execute_command = "/init";
- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
+ if (ksys_access((const char __user *)
+ ramdisk_execute_command, 0) != 0) {
ramdisk_execute_command = NULL;
prepare_namespace();
}
ramdisk_execute_command = NULL;
prepare_namespace();
}