diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/binfmt_em86.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/binfmt_em86.c')
| -rw-r--r-- | fs/binfmt_em86.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c index 446a22623..2c76e5592 100644 --- a/fs/binfmt_em86.c +++ b/fs/binfmt_em86.c @@ -36,9 +36,8 @@ static int do_load_em86(struct linux_binprm *bprm,struct pt_regs *regs) /* First of all, some simple consistency checks */ if ((elf_ex.e_type != ET_EXEC && elf_ex.e_type != ET_DYN) || (!((elf_ex.e_machine == EM_386) || (elf_ex.e_machine == EM_486))) || - (!bprm->dentry->d_inode->i_op || - !bprm->dentry->d_inode->i_op->default_file_ops || - !bprm->dentry->d_inode->i_op->default_file_ops->mmap)) { + (!bprm->dentry->d_inode->i_fop || + !bprm->dentry->d_inode->i_fop->mmap)) { return -ENOEXEC; } |