Merge ../linux-2.6

3 files changed, 6 insertions, 4 deletions

diff --git a/arch/x86_64/ia32/Makefile b/arch/x86_64/ia32/Makefile
index 929e6b0771f8..e9263b4975e0 100644
--- a/arch/x86_64/ia32/Makefile
+++ b/arch/x86_64/ia32/Makefile
@@ -27,5 +27,5 @@ $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
 $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
         $(call if_changed,syscall)
 
-AFLAGS_vsyscall-sysenter.o = -m32
-AFLAGS_vsyscall-syscall.o = -m32
+AFLAGS_vsyscall-sysenter.o = -m32 -Wa,-32
+AFLAGS_vsyscall-syscall.o = -m32 -Wa,-32
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c
index e776139afb20..926c4743d13b 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
@@ -339,7 +339,7 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top,
         struct mm_struct *mm = current->mm;
         int i, ret;
 
-        stack_base = IA32_STACK_TOP - MAX_ARG_PAGES * PAGE_SIZE;
+        stack_base = stack_top - MAX_ARG_PAGES * PAGE_SIZE;
         mm->arg_start = bprm->p + stack_base;
 
         bprm->p += stack_base;
@@ -357,7 +357,7 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top,
         {
                 mpnt->vm_mm = mm;
                 mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
-                mpnt->vm_end = IA32_STACK_TOP;
+                mpnt->vm_end = stack_top;
                 if (executable_stack == EXSTACK_ENABLE_X)
                         mpnt->vm_flags = VM_STACK_FLAGS |  VM_EXEC;
                 else if (executable_stack == EXSTACK_DISABLE_X)
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 5a9802676689..5a92fed2d1d5 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -694,4 +694,6 @@ ia32_sys_call_table:
         .quad compat_sys_get_robust_list
         .quad sys_splice
         .quad sys_sync_file_range
+        .quad sys_tee
+        .quad compat_sys_vmsplice
 ia32_syscall_end: