---

yaml --- r: 336116 b: refs/heads/master c: 783657a h: refs/heads/master v: v3
git-mirror · Nov 30, 2012 · 5ca393d · 5ca393d
1 parent 7d83ed0
commit 5ca393d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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)