From e26b5c6ae7500bb36f48b28bc5cf1b3caf85225e Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Date: Wed, 15 Oct 2008 22:02:37 -0700
Subject: [PATCH] --- yaml --- r: 114787 b: refs/heads/master c:
 53112488bebe25c0f5f8a002470046c0fe9a6c61 h: refs/heads/master i:   114785:
 1453e0227c55449cc4a6d4067f11585f4f7b7a5b   114783:
 dff47181c70551d708f3d2a488890c0f52908989 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/alpha/include/asm/a.out.h | 2 +-
 trunk/fs/exec.c                      | 2 +-
 trunk/include/linux/binfmts.h        | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 727116446b58..4e2d25395e65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cde162c2a963dba6d1b6921b58917ef8f27f4150
+refs/heads/master: 53112488bebe25c0f5f8a002470046c0fe9a6c61
diff --git a/trunk/arch/alpha/include/asm/a.out.h b/trunk/arch/alpha/include/asm/a.out.h
index 02ce8473870a..acdc681231cb 100644
--- a/trunk/arch/alpha/include/asm/a.out.h
+++ b/trunk/arch/alpha/include/asm/a.out.h
@@ -95,7 +95,7 @@ struct exec
    Worse, we have to notice the start address before swapping to use
    /sbin/loader, which of course is _not_ a TASO application.  */
 #define SET_AOUT_PERSONALITY(BFPM, EX) \
-	set_personality (((BFPM->sh_bang || EX.ah.entry < 0x100000000L \
+	set_personality (((BFPM->taso || EX.ah.entry < 0x100000000L \
 			   ? ADDR_LIMIT_32BIT : 0) | PER_OSF4))
 
 #endif /* __KERNEL__ */
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 7b5ed50eadeb..4a790f2e224e 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1189,7 +1189,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
 			return retval;
 
 		/* Remember if the application is TASO.  */
-		bprm->sh_bang = eh->ah.entry < 0x100000000UL;
+		bprm->taso = eh->ah.entry < 0x100000000UL;
 
 		bprm->file = file;
 		bprm->loader = loader;
diff --git a/trunk/include/linux/binfmts.h b/trunk/include/linux/binfmts.h
index 826f62350805..54980a3c7602 100644
--- a/trunk/include/linux/binfmts.h
+++ b/trunk/include/linux/binfmts.h
@@ -36,6 +36,9 @@ struct linux_binprm{
 	unsigned long p; /* current top of mem */
 	unsigned int sh_bang:1,
 		     misc_bang:1;
+#ifdef __alpha__
+	unsigned int taso:1;
+#endif
 	struct file * file;
 	int e_uid, e_gid;
 	kernel_cap_t cap_post_exec_permitted;