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>
This commit is contained in:
parent
b052beb043
commit
702773b16e
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue