From d977adcf886b4d2eed1ff4d3e495cadb74da03b5 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Mon, 27 Sep 2010 09:00:12 +0200
Subject: [PATCH] --- yaml --- r: 217351 b: refs/heads/master c:
 d5bd910696a27e505078c19ba6b4143537570681 h: refs/heads/master i:   217349:
 0ff6dca42798a53c2a77cdd3c1c9a4e251294314   217347:
 516d1ecdea33b6c05919452aceed708be832a924   217343:
 76ec01a2a5ae56cda07bb0727d29e737b47ae80c v: v3

---
 [refs]             | 2 +-
 trunk/mm/hugetlb.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 360f8748f03e..b3b2cee3fd85 100644
--- 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
index 7123270bfb38..67cd03239b75 100644
--- 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.