From ecb68357105c23e8eb3dfb33e00378e77735bd2d Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Sat, 3 Sep 2005 15:54:43 -0700
Subject: [PATCH] --- yaml --- r: 6857 b: refs/heads/master c:
 3279ffd97f1b3962e40d3c5f09495ef8320b180b h: refs/heads/master i:   6855:
 67c37ef3dedb2db0c7b7a53c3442ee0288bf779b v: v3

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

diff --git a/[refs] b/[refs]
index 147ae51413a3..8b1a2f0f7bef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dae06ac43d56d23e50a2300d511b32a9e38cd657
+refs/heads/master: 3279ffd97f1b3962e40d3c5f09495ef8320b180b
diff --git a/trunk/mm/swap_state.c b/trunk/mm/swap_state.c
index 4f251775ef90..029e56eb5e77 100644
--- a/trunk/mm/swap_state.c
+++ b/trunk/mm/swap_state.c
@@ -124,6 +124,7 @@ void __delete_from_swap_cache(struct page *page)
 	BUG_ON(!PageLocked(page));
 	BUG_ON(!PageSwapCache(page));
 	BUG_ON(PageWriteback(page));
+	BUG_ON(PagePrivate(page));
 
 	radix_tree_delete(&swapper_space.page_tree, page->private);
 	page->private = 0;
@@ -196,11 +197,6 @@ void delete_from_swap_cache(struct page *page)
 {
 	swp_entry_t entry;
 
-	BUG_ON(!PageSwapCache(page));
-	BUG_ON(!PageLocked(page));
-	BUG_ON(PageWriteback(page));
-	BUG_ON(PagePrivate(page));
-  
 	entry.val = page->private;
 
 	write_lock_irq(&swapper_space.tree_lock);