---

yaml
---
r: 126231
b: refs/heads/master
c: ebdd4ae
h: refs/heads/master
i:
  126229: e262676
  126227: ea09eec
  126223: 814b9fa
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0d7a4b3ed46816f5097d521850a8ab7a0d40f3c
+refs/heads/master: ebdd4aea8d736e3b5ce27ab0a26860c9fded341b

trunk/mm/hugetlb.c

@@ -400,8 +400,10 @@ static void clear_huge_page(struct page *page,
 {
 	int i;
 
-	if (unlikely(sz > MAX_ORDER_NR_PAGES))
-		return clear_gigantic_page(page, addr, sz);
+	if (unlikely(sz > MAX_ORDER_NR_PAGES)) {
+		clear_gigantic_page(page, addr, sz);
+		return;
+	}
 
 	might_sleep();
 	for (i = 0; i < sz/PAGE_SIZE; i++) {
@@ -433,8 +435,10 @@ static void copy_huge_page(struct page *dst, struct page *src,
 	int i;
 	struct hstate *h = hstate_vma(vma);
 
-	if (unlikely(pages_per_huge_page(h) > MAX_ORDER_NR_PAGES))
-		return copy_gigantic_page(dst, src, addr, vma);
+	if (unlikely(pages_per_huge_page(h) > MAX_ORDER_NR_PAGES)) {
+		copy_gigantic_page(dst, src, addr, vma);
+		return;
+	}
 
 	might_sleep();
 	for (i = 0; i < pages_per_huge_page(h); i++) {