From 340eded4e3073291ba19b0c2b1d1dbbd121946f3 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Tue, 16 Feb 2010 15:24:01 +0100
Subject: [PATCH] --- yaml --- r: 180575 b: refs/heads/master c:
 11557b24fdec13cb1c3d5f681688401a651ed54e h: refs/heads/master i:   180573:
 f1a846a6c020b1376e2f5abe68e3123cb079aab1   180571:
 bcb67c84f413cc3bc1f53c2e3313f8370d3fa158   180567:
 2ab3240e0f28df35f742720d69de7a83ec871ea2   180559:
 a3c059a608982b8f77c6178c8ffb35783be9fd3d   180543:
 96dfc2e383757bd722329f6424eb0224456be558 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/include/asm/elf.h | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c7c4d7b25bbf..b38fa1b7cea3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1252f238db48ec419f40c1bdf30fda649860eed9
+refs/heads/master: 11557b24fdec13cb1c3d5f681688401a651ed54e
diff --git a/trunk/arch/x86/include/asm/elf.h b/trunk/arch/x86/include/asm/elf.h
index 1994d3f58443..f2ad2163109d 100644
--- a/trunk/arch/x86/include/asm/elf.h
+++ b/trunk/arch/x86/include/asm/elf.h
@@ -170,10 +170,7 @@ static inline void elf_common_init(struct thread_struct *t,
 }
 
 #define ELF_PLAT_INIT(_r, load_addr)			\
-do {							\
-	elf_common_init(&current->thread, _r, 0);	\
-	clear_thread_flag(TIF_IA32);			\
-} while (0)
+	elf_common_init(&current->thread, _r, 0)
 
 #define	COMPAT_ELF_PLAT_INIT(regs, load_addr)		\
 	elf_common_init(&current->thread, regs, __USER_DS)