---

yaml --- r: 217351 b: refs/heads/master c: d5bd910 h: refs/heads/master i: 217349: 0ff6dca 217347: 516d1ec 217343: 76ec01a v: v3
git-mirror · Oct 8, 2010 · d977adc · d977adc
1 parent 8b17ce0
commit d977adc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e1c19750a8991c66e998a1915f2ad5c391bbd04
+refs/heads/master: d5bd910696a27e505078c19ba6b4143537570681
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -2946,6 +2946,8 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed)
 	hugetlb_acct_memory(h, -(chg - freed));
 }
 
+#ifdef CONFIG_MEMORY_FAILURE
+
 /* Should be called in hugetlb_lock */
 static int is_hugepage_on_freelist(struct page *hpage)
 {
@@ -2960,7 +2962,6 @@ static int is_hugepage_on_freelist(struct page *hpage)
 	return 0;
 }
 
-#ifdef CONFIG_MEMORY_FAILURE
 /*
  * This function is called from memory failure code.
  * Assume the caller holds page lock of the head page.