The patch titled exec: do not retry load_binary method if CONFIG_MODULES=n has been removed from the -mm tree. Its filename was exec-do-not-retry-load_binary-method-if-config_modules=n.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: exec: do not retry load_binary method if CONFIG_MODULES=n From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> If CONFIG_MODULES=n, it makes no sense to retry the list of binary formats handler because the list will not be modified by request_module(). Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> Cc: Richard Weinberger <richard@xxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN fs/exec.c~exec-do-not-retry-load_binary-method-if-config_modules=n fs/exec.c --- a/fs/exec.c~exec-do-not-retry-load_binary-method-if-config_modules=n +++ a/fs/exec.c @@ -1430,9 +1430,9 @@ int search_binary_handler(struct linux_b } } read_unlock(&binfmt_lock); +#ifdef CONFIG_MODULES if (retval != -ENOEXEC || bprm->mm == NULL) { break; -#ifdef CONFIG_MODULES } else { #define printable(c) (((c)=='\t') || ((c)=='\n') || (0x20<=(c) && (c)<=0x7e)) if (printable(bprm->buf[0]) && @@ -1443,8 +1443,10 @@ int search_binary_handler(struct linux_b if (try) break; /* -ENOEXEC */ request_module("binfmt-%04x", *(unsigned short *)(&bprm->buf[2])); -#endif } +#else + break; +#endif } return retval; } _ Patches currently in -mm which might be from penguin-kernel@xxxxxxxxxxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html