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 git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
fs
/
binfmt_misc.c
diff --git
a/fs/binfmt_misc.c
b/fs/binfmt_misc.c
index
9e60fd2
..
fd0cc0b
100644
(file)
--- a/
fs/binfmt_misc.c
+++ b/
fs/binfmt_misc.c
@@
-108,7
+108,7
@@
static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
Node *fmt;
struct file * interp_file = NULL;
char iname[BINPRM_BUF_SIZE];
Node *fmt;
struct file * interp_file = NULL;
char iname[BINPRM_BUF_SIZE];
- char *iname_addr = iname;
+ c
onst c
har *iname_addr = iname;
int retval;
int fd_binary = -1;
int retval;
int fd_binary = -1;
@@
-724,7
+724,7
@@
static int __init init_misc_binfmt(void)
{
int err = register_filesystem(&bm_fs_type);
if (!err) {
{
int err = register_filesystem(&bm_fs_type);
if (!err) {
- err =
register
_binfmt(&misc_format);
+ err =
insert
_binfmt(&misc_format);
if (err)
unregister_filesystem(&bm_fs_type);
}
if (err)
unregister_filesystem(&bm_fs_type);
}