Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 3 deletions

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;