commit e77414e0aad6a1b063ba5e5750c582c75327ea6a
author Al Viro <viro@zeniv.linux.org.uk> Sat Dec 05 15:10:44 2009 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Fri Dec 11 06:44:59 2009 -0500
tree 9492b584ce6a3e4f99570ce4517d7efaaff4fb93
parent bb52d6694002b9d632bb355f64daa045c6293a4e

fix broken aliasing checks for MAP_FIXED on sparc32, mips, arm and sh

We want addr - (pgoff << PAGE_SHIFT) consistently coloured...

Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

arch/arm/mm/mmap.c

diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index 2b79964..f5abc51 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -54,7 +54,8 @@
 	 * We enforce the MAP_FIXED case.
 	 */
 	if (flags & MAP_FIXED) {
-		if (aliasing && flags & MAP_SHARED && addr & (SHMLBA - 1))
+		if (aliasing && flags & MAP_SHARED &&
+		    (addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))
 			return -EINVAL;
 		return addr;
 	}