Merge branch 'next' into for-linus

[linux-flexiantxendom0-natty.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 511b098..5528ff3 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -580,12 +580,10 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
  */
 static inline unsigned long round_hint_to_min(unsigned long hint)
 {
-#ifdef CONFIG_SECURITY
        hint &= PAGE_MASK;
        if (((void *)hint != NULL) &&
            (hint < mmap_min_addr))
                return PAGE_ALIGN(mmap_min_addr);
-#endif
        return hint;
 }