From: Andrew Morton <akpm@osdl.org>

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Gerd Hoffmann <kraxel@suse.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/sysenter.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff -puN arch/i386/kernel/sysenter.c~vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy arch/i386/kernel/sysenter.c
--- devel/arch/i386/kernel/sysenter.c~vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy	2006-06-10 09:52:22.000000000 -0700
+++ devel-akpm/arch/i386/kernel/sysenter.c	2006-06-10 09:52:22.000000000 -0700
@@ -155,15 +155,12 @@ int arch_setup_additional_pages(struct l
 	current_thread_info()->sysenter_return =
 				    (void *)VDSO_SYM(&SYSENTER_RETURN);
 	mm->total_vm++;
+up_fail:
 	up_write(&mm->mmap_sem);
-
-	return 0;
+	return ret;
 
 free_vma:
 	kmem_cache_free(vm_area_cachep, vma);
-up_fail:
-	up_write(&mm->mmap_sem);
-
 	return ret;
 }
 
_