From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun, 6 May 2007 21:50:11 +0000 (-0700)
Subject: get_unmapped_area handles MAP_FIXED on x86_64
X-Git-Tag: v2.6.22-rc1~930
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=11300a64d08ebce03e30cac8eb58e8ce008e4bb7;p=linux-2.6-omap-h63xx.git

get_unmapped_area handles MAP_FIXED on x86_64

Handle MAP_FIXED in x86_64 arch_get_unmapped_area(), simple case, just return
the address as passed in

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86_64/kernel/sys_x86_64.c b/arch/x86_64/kernel/sys_x86_64.c
index 76bf7c241fe..f891931eb75 100644
--- a/arch/x86_64/kernel/sys_x86_64.c
+++ b/arch/x86_64/kernel/sys_x86_64.c
@@ -93,6 +93,9 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
 	unsigned long start_addr;
 	unsigned long begin, end;
 	
+	if (flags & MAP_FIXED)
+		return addr;
+
 	find_start_end(flags, &begin, &end); 
 
 	if (len > end)