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 #include #include -#include #include #include #include @@ -61,6 +60,11 @@ #include #endif +#ifdef __alpha__ +/* for /sbin/loader handling in search_binary_handler() */ +#include +#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;