From c364e01534acff858ca22d0538150314cc82ee68 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 16 Jun 2008 12:11:54 +0100
Subject: [PATCH] --- yaml --- r: 98138 b: refs/heads/master c:
 702773b16e83fcddc41e0019b8214d3c3cecedbe h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3e9bb82f50ed..528868a4b412 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b052beb0432616aa4dac2b167e7809feae993991
+refs/heads/master: 702773b16e83fcddc41e0019b8214d3c3cecedbe
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 9448f1b50b4a..da94a6f05df3 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -26,7 +26,6 @@
 #include <linux/file.h>
 #include <linux/fdtable.h>
 #include <linux/mman.h>
-#include <linux/a.out.h>
 #include <linux/stat.h>
 #include <linux/fcntl.h>
 #include <linux/smp_lock.h>
@@ -61,6 +60,11 @@
 #include <linux/kmod.h>
 #endif
 
+#ifdef __alpha__
+/* for /sbin/loader handling in search_binary_handler() */
+#include <linux/a.out.h>
+#endif
+
 int core_uses_pid;
 char core_pattern[CORENAME_MAX_SIZE] = "core";
 int suid_dumpable = 0;
@@ -1155,7 +1159,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
 {
 	int try,retval;
 	struct linux_binfmt *fmt;
-#if defined(__alpha__) && defined(CONFIG_ARCH_SUPPORTS_AOUT)
+#ifdef __alpha__
 	/* handle /sbin/loader.. */
 	{
 	    struct exec * eh = (struct exec *) bprm->buf;