X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fnommu.c;h=b989cb928a7cf29ec5ad66ff519f80633bfe8129;hb=77b4c255af34e73ea1efd1c3384bbe91361c81e6;hp=8f09333f78e1d63dbe1a5d24c9ba240ce683dbc6;hpb=81f8320f624a785d77443ace83391d0fdee695f6;p=linux-2.6

diff --git a/mm/nommu.c b/mm/nommu.c
index 8f09333f78..b989cb928a 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -12,6 +12,7 @@
  *  Copyright (c) 2002      Greg Ungerer <gerg@snapgear.com>
  */
 
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/mman.h>
 #include <linux/swap.h>
@@ -828,6 +829,9 @@ unsigned long do_mmap_pgoff(struct file *file,
 	void *result;
 	int ret;
 
+	if (!(flags & MAP_FIXED))
+		addr = round_hint_to_min(addr);
+
 	/* decide whether we should attempt the mapping, and if so what sort of
 	 * mapping */
 	ret = validate_mmap_request(file, addr, len, prot, flags, pgoff,