From 5ca393de7b4ea2384749ba30587de07b0ff095a3 Mon Sep 17 00:00:00 2001
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Date: Thu, 29 Nov 2012 13:54:34 -0800
Subject: [PATCH] --- yaml --- r: 336116 b: refs/heads/master c:
 783657a7dc20e5c0efbc9a09a9dd38e238a723da h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/mm/memory-failure.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index babef006bbef..1d64940c0ed4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 782fd30406ecb9d9b082816abe0c6008fc72a7b0
+refs/heads/master: 783657a7dc20e5c0efbc9a09a9dd38e238a723da
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index 6c5899b9034a..8b20278be6a6 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -1476,9 +1476,17 @@ int soft_offline_page(struct page *page, int flags)
 {
 	int ret;
 	unsigned long pfn = page_to_pfn(page);
+	struct page *hpage = compound_trans_head(page);
 
 	if (PageHuge(page))
 		return soft_offline_huge_page(page, flags);
+	if (PageTransHuge(hpage)) {
+		if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) {
+			pr_info("soft offline: %#lx: failed to split THP\n",
+				pfn);
+			return -EBUSY;
+		}
+	}
 
 	ret = get_any_page(page, pfn, flags);
 	if (ret < 0)