commit 4040153087478993cbf0809f444400a3c808074c
author Al Viro <viro@ftp.linux.org.uk> Mon Feb 13 03:58:52 2012 +0000
committer James Morris <jmorris@namei.org> Tue Feb 14 10:45:42 2012 +1100
tree 2dc7af85b0cf930f1656553bd38410b8c16601a6
parent 191c542442fdf53cc3c496c00be13367fd9cd42d

security: trim security.h

Trim security.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: James Morris <jmorris@namei.org>

mm/mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index db05495..694a862 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -936,6 +936,19 @@
 #endif /* CONFIG_PROC_FS */
 
 /*
+ * If a hint addr is less than mmap_min_addr change hint to be as
+ * low as possible but still greater than mmap_min_addr
+ */
+static inline unsigned long round_hint_to_min(unsigned long hint)
+{
+	hint &= PAGE_MASK;
+	if (((void *)hint != NULL) &&
+	    (hint < mmap_min_addr))
+		return PAGE_ALIGN(mmap_min_addr);
+	return hint;
+}
+
+/*
  * The caller must hold down_write(&current->mm->mmap_sem).
  */