diff --git a/[refs] b/[refs] index 266304862c33..20d2d4f87f1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68589bc353037f233fe510ad9ff432338c95db66 +refs/heads/master: cb07c9a1864a8eac9f3123e428100d5b2a16e65a diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c index bdace87d7c01..2526463c99a7 100644 --- a/trunk/mm/mmap.c +++ b/trunk/mm/mmap.c @@ -1880,6 +1880,10 @@ unsigned long do_brk(unsigned long addr, unsigned long len) if ((addr + len) > TASK_SIZE || (addr + len) < addr) return -EINVAL; + error = is_hugepage_only_range(current->mm, addr, len); + if (error) + return error; + flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; error = arch_mmap_check(addr, len, flags);