Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2 files changed, 0 insertions, 3 deletions

diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index a7280d9f6c16..4e7a6a1ec6c7 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -261,8 +261,6 @@ elf32_set_personality (void)
 {
         set_personality(PER_LINUX32);
         current->thread.map_base  = IA32_PAGE_OFFSET/3;
-        current->thread.task_size = IA32_PAGE_OFFSET;   /* use what Linux/x86 uses... */
-        set_fs(USER_DS);                                /* set addr limit for new TASK_SIZE */
 }
 
 static unsigned long
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index e3e9290e3ff2..68ceb4e690c7 100644
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -305,7 +305,6 @@ struct old_linux32_dirent {
 #define ELF_DATA        ELFDATA2LSB
 #define ELF_ARCH        EM_386
 
-#define IA32_PAGE_OFFSET        0xc0000000
 #define IA32_STACK_TOP          IA32_PAGE_OFFSET
 #define IA32_GATE_OFFSET        IA32_PAGE_OFFSET
 #define IA32_GATE_END           IA32_PAGE_OFFSET + PAGE_SIZE