aboutsummaryrefslogtreecommitdiffstats
path: root/init/noinitramfs.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-11-16 10:09:42 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-11-16 10:09:42 +0100
commita02056349cdea2252cd2b21643ebf025e83a29f2 (patch)
treeb7c889d6cbe8e7188d07d99a5c9da858c53a5b6c /init/noinitramfs.c
parent34db1d595ef6f183fbc1e42cda45a3dfa0035258 (diff)
parente53beacd23d9cb47590da6a7a7f6d417b941a994 (diff)
downloadkernel_samsung_crespo-a02056349cdea2252cd2b21643ebf025e83a29f2.zip
kernel_samsung_crespo-a02056349cdea2252cd2b21643ebf025e83a29f2.tar.gz
kernel_samsung_crespo-a02056349cdea2252cd2b21643ebf025e83a29f2.tar.bz2
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
Diffstat (limited to 'init/noinitramfs.c')
-rw-r--r--init/noinitramfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/noinitramfs.c b/init/noinitramfs.c
index f4c1a3a..267739d 100644
--- a/init/noinitramfs.c
+++ b/init/noinitramfs.c
@@ -29,17 +29,17 @@ static int __init default_rootfs(void)
{
int err;
- err = sys_mkdir("/dev", 0755);
+ err = sys_mkdir((const char __user __force *) "/dev", 0755);
if (err < 0)
goto out;
- err = sys_mknod((const char __user *) "/dev/console",
+ err = sys_mknod((const char __user __force *) "/dev/console",
S_IFCHR | S_IRUSR | S_IWUSR,
new_encode_dev(MKDEV(5, 1)));
if (err < 0)
goto out;
- err = sys_mkdir("/root", 0700);
+ err = sys_mkdir((const char __user __force *) "/root", 0700);
if (err < 0)
goto out;