diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 12:38:34 -0700 |
commit | c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9 (patch) | |
tree | edfd028285e21ba549d047c0caa4ffe523272f94 /fs/exec.c | |
parent | e4856a70cfc23266631a78e78277cf2b195babee (diff) | |
parent | 118a9069f06ff591d51a3133e242f0c256ba2db7 (diff) | |
download | linux-stable-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.tar.gz linux-stable-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.tar.bz2 linux-stable-c8d8a2321f9c4ee18fbcc399fdc2a77e580a03b9.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: remove CONFIG_KMOD in comment after #endif
remove CONFIG_KMOD from fs
remove CONFIG_KMOD from drivers
Manually fix conflict due to include cleanups in drivers/md/md.c
Diffstat (limited to 'fs/exec.c')
-rw-r--r-- | fs/exec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/exec.c b/fs/exec.c index cfb5656b2cdc..a41e7902ed0b 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -50,15 +50,12 @@ #include <linux/cn_proc.h> #include <linux/audit.h> #include <linux/tracehook.h> +#include <linux/kmod.h> #include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/tlb.h> -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif - #ifdef __alpha__ /* for /sbin/loader handling in search_binary_handler() */ #include <linux/a.out.h> @@ -1245,8 +1242,8 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) read_unlock(&binfmt_lock); if (retval != -ENOEXEC || bprm->mm == NULL) { break; -#ifdef CONFIG_KMOD - }else{ +#ifdef CONFIG_MODULES + } else { #define printable(c) (((c)=='\t') || ((c)=='\n') || (0x20<=(c) && (c)<=0x7e)) if (printable(bprm->buf[0]) && printable(bprm->buf[1]) && |