From c17d119587051af98d381147dedf2b2327ab7451 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Date: Tue, 26 Jul 2011 16:08:42 -0700
Subject: [PATCH] --- yaml --- r: 260418 b: refs/heads/master c:
 b4edf8bd06916645b57df23a720b17cae4051c43 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5950bb9db519..ebab7f0c0308 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 912193521b719fbfc2f16776febf5232fe8ba261
+refs/heads/master: b4edf8bd06916645b57df23a720b17cae4051c43
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index e6770a526f34..0e8e59939d09 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1430,9 +1430,9 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
 			}
 		}
 		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_binprm *bprm,struct pt_regs *regs)
 			if (try)
 				break; /* -ENOEXEC */
 			request_module("binfmt-%04x", *(unsigned short *)(&bprm->buf[2]));
-#endif
 		}
+#else
+		break;
+#endif
 	}
 	return retval;
 }