linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ia64 / ia32 / binfmt_elf32.c

diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index c862af6..96b3e14 100644 (file)
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -35,7 +35,7 @@ extern void ia64_elf32_init (struct pt_regs *regs);
 
 static void elf32_set_personality (void);
 
-#define setup_arg_pages(bprm,exec)             ia32_setup_arg_pages(bprm,exec)
+#define setup_arg_pages(bprm,tos,exec)         ia32_setup_arg_pages(bprm,exec)
 #define elf_map                                elf32_map
 
 #undef SET_PERSONALITY
@@ -103,7 +103,7 @@ ia64_elf32_init (struct pt_regs *regs)
                        if (insert_vm_struct(current->mm, vma)) {
                                kmem_cache_free(vm_area_cachep, vma);
                                up_write(&current->mm->mmap_sem);
-                               return;
+                               BUG();
                        }
                }
                up_write(&current->mm->mmap_sem);
@@ -130,35 +130,12 @@ ia64_elf32_init (struct pt_regs *regs)
                        if (insert_vm_struct(current->mm, vma)) {
                                kmem_cache_free(vm_area_cachep, vma);
                                up_write(&current->mm->mmap_sem);
-                               return;
+                               BUG();
                        }
                }
                up_write(&current->mm->mmap_sem);
        }
 
-       /*
-        * When user stack is not executable, push sigreturn code to stack makes
-        * segmentation fault raised when returning to kernel. So now sigreturn
-        * code is locked in specific gate page, which is pointed by pretcode
-        * when setup_frame_ia32
-        */
-       vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
-       if (vma) {
-               memset(vma, 0, sizeof(*vma));
-               vma->vm_mm = current->mm;
-               vma->vm_start = IA32_GATE_OFFSET;
-               vma->vm_end = vma->vm_start + PAGE_SIZE;
-               vma->vm_page_prot = PAGE_COPY_EXEC;
-               vma->vm_flags = VM_READ | VM_MAYREAD | VM_EXEC
-                               | VM_MAYEXEC | VM_RESERVED;
-               vma->vm_ops = &ia32_gate_page_vm_ops;
-               down_write(&current->mm->mmap_sem);
-               {
-                       insert_vm_struct(current->mm, vma);
-               }
-               up_write(&current->mm->mmap_sem);
-       }
-
        /*
         * Install LDT as anonymous memory.  This gives us all-zero segment descriptors
         * until a task modifies them via modify_ldt().
@@ -176,7 +153,7 @@ ia64_elf32_init (struct pt_regs *regs)
                        if (insert_vm_struct(current->mm, vma)) {
                                kmem_cache_free(vm_area_cachep, vma);
                                up_write(&current->mm->mmap_sem);
-                               return;
+                               BUG();
                        }
                }
                up_write(&current->mm->mmap_sem);
@@ -222,7 +199,7 @@ ia64_elf32_init (struct pt_regs *regs)
 int
 ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
 {
-       unsigned long stack_base, grow;
+       unsigned long stack_base;
        struct vm_area_struct *mpnt;
        struct mm_struct *mm = current->mm;
        int i, ret;
@@ -239,14 +216,6 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
        if (!mpnt)
                return -ENOMEM;
 
-       grow = (IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))
-               >> PAGE_SHIFT;
-       if (security_vm_enough_memory(grow) ||
-               !vx_vmpages_avail(mm, grow)) {
-               kmem_cache_free(vm_area_cachep, mpnt);
-               return -ENOMEM;
-       }
-
        memset(mpnt, 0, sizeof(*mpnt));
 
        down_write(&current->mm->mmap_sem);
@@ -267,7 +236,6 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
                        kmem_cache_free(vm_area_cachep, mpnt);
                        return ret;
                }
-               // current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
                vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
                current->mm->stack_vm = current->mm->total_vm;
        }
@@ -294,12 +262,10 @@ 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
-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
 {
        unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;