Include <asm/a.out.h> in fs/exec.c only for Alpha.

We only need it for the /sbin/loader hack for OSF/1 executables, and we
don't want to include it otherwise.

While we're at it, remove the redundant '&& CONFIG_ARCH_SUPPORTS_AOUT'
in the ifdef around that code. It's already dependent on __alpha__, and
CONFIG_ARCH_SUPPORTS_AOUT is hard-coded to 'y' there.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by David Woodhouse and committed by Linus Torvalds 702773b1 b052beb0

+6 -2
+6 -2
fs/exec.c
··· 26 26 #include <linux/file.h> 27 27 #include <linux/fdtable.h> 28 28 #include <linux/mman.h> 29 - #include <linux/a.out.h> 30 29 #include <linux/stat.h> 31 30 #include <linux/fcntl.h> 32 31 #include <linux/smp_lock.h> ··· 58 59 59 60 #ifdef CONFIG_KMOD 60 61 #include <linux/kmod.h> 62 + #endif 63 + 64 + #ifdef __alpha__ 65 + /* for /sbin/loader handling in search_binary_handler() */ 66 + #include <linux/a.out.h> 61 67 #endif 62 68 63 69 int core_uses_pid; ··· 1159 1155 { 1160 1156 int try,retval; 1161 1157 struct linux_binfmt *fmt; 1162 - #if defined(__alpha__) && defined(CONFIG_ARCH_SUPPORTS_AOUT) 1158 + #ifdef __alpha__ 1163 1159 /* handle /sbin/loader.. */ 1164 1160 { 1165 1161 struct exec * eh = (struct exec *) bprm->buf;