From e633a8c2989b79128b812f5c9c756c1721c3736b Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sun, 6 May 2007 14:50:11 -0700 Subject: [PATCH] --- yaml --- r: 54236 b: refs/heads/master c: 11300a64d08ebce03e30cac8eb58e8ce008e4bb7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/sys_x86_64.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6ad19bf02354..d05cb7cb8f73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac35ee484df361e1aed89873a458900693effdbe +refs/heads/master: 11300a64d08ebce03e30cac8eb58e8ce008e4bb7 diff --git a/trunk/arch/x86_64/kernel/sys_x86_64.c b/trunk/arch/x86_64/kernel/sys_x86_64.c index 76bf7c241fe4..f891931eb753 100644 --- a/trunk/arch/x86_64/kernel/sys_x86_64.c +++ b/trunk/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)