Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-12-15 12:10:10 +09:00
parent 9f815a1765 3ea6b3d0e6
commit e0aa51f54f
2366 changed files with 311984 additions and 209871 deletions
--- a/arch/sh/mm/mmap.c
+++ b/arch/sh/mm/mmap.c
@ -54,7 +54,8 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 		/* We do not accept a shared mapping if it would violate
 		 * cache aliasing constraints.
 		 */
-		if ((flags & MAP_SHARED) && (addr & shm_align_mask))
+		if ((flags & MAP_SHARED) &&
+		    ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask))
 			return -EINVAL;
 		return addr;
 	}