From dcc54d9bbe1f700df9e5811b345a694473ebf79a Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Sat, 20 Aug 2005 21:14:18 +0000 Subject: [PATCH] - sync to fedora: fix merge conflict --- arch/ia64/ia32/binfmt_elf32.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index 691235c0d..f0ae089ab 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c @@ -136,29 +136,6 @@ ia64_elf32_init (struct pt_regs *regs) up_write(¤t->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(¤t->mm->mmap_sem); - { - insert_vm_struct(current->mm, vma); - } - up_write(¤t->mm->mmap_sem); - } - /* * Install LDT as anonymous memory. This gives us all-zero segment descriptors * until a task modifies them via modify_ldt(). -- 2.47.0