Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[mirror_ubuntu-zesty-kernel.git] / mm / hugetlb.c

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 65f38c218207231e0bf5b612ccacc5858be1b4e0..e91b81b636700befc4ce10c5286e9a0e6512df7e 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -402,7 +402,7 @@ static void clear_huge_page(struct page *page,
 {
        int i;
 
-       if (unlikely(sz > MAX_ORDER_NR_PAGES)) {
+       if (unlikely(sz/PAGE_SIZE > MAX_ORDER_NR_PAGES)) {
                clear_gigantic_page(page, addr, sz);
                return;
        }