git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
[pandora-kernel.git]
/
init
/
do_mounts_rd.c
diff --git
a/init/do_mounts_rd.c
b/init/do_mounts_rd.c
index
bf3ef66
..
6e1ee69
100644
(file)
--- 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
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;
if (out_fd < 0)
goto out;
@@
-267,7
+267,7
@@
noclose_input:
sys_close(out_fd);
out:
kfree(buf);
sys_close(out_fd);
out:
kfree(buf);
- sys_unlink("/dev/ram");
+ sys_unlink(
(const char __user __force *)
"/dev/ram");
return res;
}
return res;
}