5 files changed, 11 insertions, 10 deletions

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 62a47eafa8e9..830aaec9c7d5 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -291,7 +291,7 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data)
         if (err)
                 return err;
 
-        sys_chdir("/root");
+        sys_chdir((const char __user __force *)"/root");
         ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
         printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
                current->fs->pwd.mnt->mnt_sb->s_type->name,
@@ -488,5 +488,5 @@ void __init prepare_namespace(void)
 out:
         devtmpfs_mount("dev");
         sys_mount(".", "/", NULL, MS_MOVE, NULL);
-        sys_chroot(".");
+        sys_chroot((const char __user __force *)".");
 }
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 69aebbf8fd2d..32c4799b8c91 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
 
         wait_for_device_probe();
 
-        fd = sys_open("/dev/md0", 0, 0);
+        fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
         if (fd >= 0) {
                 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
                 sys_close(fd);
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index bf3ef667bf36..6e1ee6987c78 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -168,7 +168,7 @@ int __init rd_load_image(char *from)
         char rotator[4] = { '|' , '/' , '-' , '\\' };
 #endif
 
-        out_fd = sys_open("/dev/ram", O_RDWR, 0);
+        out_fd = sys_open((const char __user __force *) "/dev/ram", O_RDWR, 0);
         if (out_fd < 0)
                 goto out;
 
@@ -267,7 +267,7 @@ noclose_input:
         sys_close(out_fd);
 out:
         kfree(buf);
-        sys_unlink("/dev/ram");
+        sys_unlink((const char __user __force *) "/dev/ram");
         return res;
 }
 
diff --git a/init/initramfs.c b/init/initramfs.c
index 4b9c20205092..d9c6e782ff53 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -528,7 +528,7 @@ static void __init clean_rootfs(void)
         struct linux_dirent64 *dirp;
         int num;
 
-        fd = sys_open("/", O_RDONLY, 0);
+        fd = sys_open((const char __user __force *) "/", O_RDONLY, 0);
         WARN_ON(fd < 0);
         if (fd < 0)
                 return;
@@ -590,7 +590,8 @@ static int __init populate_rootfs(void)
                 }
                 printk(KERN_INFO "rootfs image is not initramfs (%s)"
                                 "; looks like an initrd\n", err);
-                fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
+                fd = sys_open((const char __user __force *) "/initrd.image",
+                              O_WRONLY|O_CREAT, 0700);
                 if (fd >= 0) {
                         sys_write(fd, (char *)initrd_start,
                                         initrd_end - initrd_start);
diff --git a/init/noinitramfs.c b/init/noinitramfs.c
index f4c1a3a1b8c5..267739d85179 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;