From 2c2001657121c95c9ed07be79b5f44f13a1d393b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 30 May 2012 01:49:38 -0400
Subject: [PATCH] --- yaml --- r: 310031 b: refs/heads/master c:
 5a5e4c2eca0307deeb438c97dbdc608663515c0a h: refs/heads/master i:   310029:
 931dd771d7d78a14ba6d2d74a46328907a04fd14   310027:
 e2eb2402d9284e05317d36619304d6a2f4ad5fb6   310023:
 16413af77fe929a59bc4f3eca0e337fac19a1ebf   310015:
 782f642db0aaf50b3443a20d10c504019262ec2d v: v3

---
 [refs]                | 2 +-
 trunk/fs/binfmt_elf.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e5862b5f165b..8cc05dfbf657 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63d37a84ab6004c235314ffd7a76c5eb28c2fae0
+refs/heads/master: 5a5e4c2eca0307deeb438c97dbdc608663515c0a
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
index e658dd134b95..1b52956afe33 100644
--- a/trunk/fs/binfmt_elf.c
+++ b/trunk/fs/binfmt_elf.c
@@ -329,7 +329,6 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
 	if (!size)
 		return addr;
 
-	down_write(&current->mm->mmap_sem);
 	/*
 	* total_size is the size of the ELF (interpreter) image.
 	* The _first_ mmap needs to know the full size, otherwise
@@ -340,13 +339,12 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
 	*/
 	if (total_size) {
 		total_size = ELF_PAGEALIGN(total_size);
-		map_addr = do_mmap(filep, addr, total_size, prot, type, off);
+		map_addr = vm_mmap(filep, addr, total_size, prot, type, off);
 		if (!BAD_ADDR(map_addr))
-			do_munmap(current->mm, map_addr+size, total_size-size);
+			vm_munmap(map_addr+size, total_size-size);
 	} else
-		map_addr = do_mmap(filep, addr, size, prot, type, off);
+		map_addr = vm_mmap(filep, addr, size, prot, type, off);
 
-	up_write(&current->mm->mmap_sem);
 	return(map_addr);
 }