Merge branch 'next' into for-linus

This commit is contained in:
James Morris 2009-06-11 11:03:14 +10:00
commit 73fbad283c
58 changed files with 1945 additions and 476 deletions

View file

@ -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;
}