diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 10:28:40 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-17 02:38:36 +1100 |
| commit | 5f4123be3cdb1dbd77fa9d6d2bb96bb9689a0a19 (patch) | |
| tree | e636c2ae7d5a5459f4f4625d44754737f45a984f /fs/exec.c | |
| parent | a65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (diff) | |
| download | linux-5f4123be3cdb1dbd77fa9d6d2bb96bb9689a0a19.tar.bz2 | |
remove CONFIG_KMOD from fs
Just always compile the code when the kernel is modular.
Convert load_nls to use try_then_request_module to tidy
up the code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
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 cecee501ce78..9811679b0695 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> @@ -1247,8 +1244,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]) && |