---

yaml --- r: 230748 b: refs/heads/master c: a95a82e h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · 39444d4 · 39444d4
1 parent c4da40d
commit 39444d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9180706344487700b40da9eca5dedd3d11cb33b4
+refs/heads/master: a95a82e96c48270980dd248ccd5546f1b49e6f8a
diff --git a/trunk/mm/swap.c b/trunk/mm/swap.c
@@ -131,8 +131,12 @@ static void put_compound_page(struct page *page)
 			atomic_dec(&page->_count);
 			VM_BUG_ON(atomic_read(&page_head->_count) <= 0);
 			compound_unlock_irqrestore(page_head, flags);
-			if (put_page_testzero(page_head))
-				__put_compound_page(page_head);
+			if (put_page_testzero(page_head)) {
+				if (PageHead(page_head))
+					__put_compound_page(page_head);
+				else
+					__put_single_page(page_head);
+			}
 		} else {
 			/* page_head is a dangling pointer */
 			VM_BUG_ON(PageTail(page));