From 29f0806fa326652a369e06d5035d7af24e20e48c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 30 Nov 2009 17:00:51 -0500
Subject: [PATCH] --- yaml --- r: 174853 b: refs/heads/master c:
 564b3bffc619dcbdd160de597b0547a7017ea010 h: refs/heads/master i:   174851:
 894622e218cfa2702e79b382a97821b51b8fd5f1 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/mn10300/include/asm/mman.h   | 5 +++++
 trunk/arch/mn10300/kernel/sys_mn10300.c | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 114b9b850fa6..c084fa4b7eb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 570dcf2c15463842e384eb597a87c1e39bead99b
+refs/heads/master: 564b3bffc619dcbdd160de597b0547a7017ea010
diff --git a/trunk/arch/mn10300/include/asm/mman.h b/trunk/arch/mn10300/include/asm/mman.h
index 8eebf89f5ab1..db5c53da73ce 100644
--- a/trunk/arch/mn10300/include/asm/mman.h
+++ b/trunk/arch/mn10300/include/asm/mman.h
@@ -1 +1,6 @@
 #include <asm-generic/mman.h>
+
+#define MIN_MAP_ADDR	PAGE_SIZE	/* minimum fixed mmap address */
+
+#define arch_mmap_check(addr, len, flags) \
+	(((flags) & MAP_FIXED && (addr) < MIN_MAP_ADDR) ? -EINVAL : 0)
diff --git a/trunk/arch/mn10300/kernel/sys_mn10300.c b/trunk/arch/mn10300/kernel/sys_mn10300.c
index 8ca5af00334c..ec4100dfcb7d 100644
--- a/trunk/arch/mn10300/kernel/sys_mn10300.c
+++ b/trunk/arch/mn10300/kernel/sys_mn10300.c
@@ -23,8 +23,6 @@
 
 #include <asm/uaccess.h>
 
-#define MIN_MAP_ADDR	PAGE_SIZE	/* minimum fixed mmap address */
-
 /*
  * memory mapping syscall
  */
@@ -37,9 +35,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
 
 	flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
 
-	if (flags & MAP_FIXED && addr < MIN_MAP_ADDR)
-		goto out;
-
 	error = -EBADF;
 	if (!(flags & MAP_ANONYMOUS)) {
 		file = fget(fd);