Merge branch 'master' into export-slabh

[karo-tx-linux.git] / fs / binfmt_em86.c

diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c
index f9c88d0c8cedeabcfdca1a5f81a51e1e293a59ea..b8e8b0acf9bd8df4b3ca369a152afbe01cd9d476 100644 (file)
--- a/fs/binfmt_em86.c
+++ b/fs/binfmt_em86.c
@@ -11,7 +11,6 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/stat.h>
-#include <linux/slab.h>
 #include <linux/binfmts.h>
 #include <linux/elf.h>
 #include <linux/init.h>
@@ -43,7 +42,7 @@ static int load_em86(struct linux_binprm *bprm,struct pt_regs *regs)
                        return -ENOEXEC;
        }
 
-       bprm->sh_bang = 1;      /* Well, the bang-shell is implicit... */
+       bprm->recursion_depth++; /* Well, the bang-shell is implicit... */
        allow_write_access(bprm->file);
        fput(bprm->file);
        bprm->file = NULL;