From 9c621a310986fefd9bd51ce5d5a7d07f9acb5b20 Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Thu, 13 Jan 2011 15:47:16 -0800
Subject: [PATCH] --- yaml --- r: 230808 b: refs/heads/master c:
 91600e9e592e48736e630851c83da2ad6bf0e91f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 70e45d473683..e4e4faf6389d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14d1a55cd26f1860f837f37ae42520c7c13b1347
+refs/heads/master: 91600e9e592e48736e630851c83da2ad6bf0e91f
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index 6a283cc9317c..1b43d0ffff65 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -386,7 +386,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,
 	struct task_struct *tsk;
 	struct anon_vma *av;
 
-	if (unlikely(split_huge_page(page)))
+	if (!PageHuge(page) && unlikely(split_huge_page(page)))
 		return;
 	read_lock(&tasklist_lock);
 	av = page_lock_anon_vma(page);
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index 3825ae4bc32f..c30f33854f97 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -1430,7 +1430,7 @@ int try_to_unmap(struct page *page, enum ttu_flags flags)
 	int ret;
 
 	BUG_ON(!PageLocked(page));
-	BUG_ON(PageTransHuge(page));
+	VM_BUG_ON(!PageHuge(page) && PageTransHuge(page));
 
 	if (unlikely(PageKsm(page)))
 		ret = try_to_unmap_ksm(page, flags);