diff options
Diffstat (limited to 'mm/swap_state.c')
-rw-r--r-- | mm/swap_state.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 4f251775ef90..029e56eb5e77 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c | |||
@@ -124,6 +124,7 @@ void __delete_from_swap_cache(struct page *page) | |||
124 | BUG_ON(!PageLocked(page)); | 124 | BUG_ON(!PageLocked(page)); |
125 | BUG_ON(!PageSwapCache(page)); | 125 | BUG_ON(!PageSwapCache(page)); |
126 | BUG_ON(PageWriteback(page)); | 126 | BUG_ON(PageWriteback(page)); |
127 | BUG_ON(PagePrivate(page)); | ||
127 | 128 | ||
128 | radix_tree_delete(&swapper_space.page_tree, page->private); | 129 | radix_tree_delete(&swapper_space.page_tree, page->private); |
129 | page->private = 0; | 130 | page->private = 0; |
@@ -196,11 +197,6 @@ void delete_from_swap_cache(struct page *page) | |||
196 | { | 197 | { |
197 | swp_entry_t entry; | 198 | swp_entry_t entry; |
198 | 199 | ||
199 | BUG_ON(!PageSwapCache(page)); | ||
200 | BUG_ON(!PageLocked(page)); | ||
201 | BUG_ON(PageWriteback(page)); | ||
202 | BUG_ON(PagePrivate(page)); | ||
203 | |||
204 | entry.val = page->private; | 200 | entry.val = page->private; |
205 | 201 | ||
206 | write_lock_irq(&swapper_space.tree_lock); | 202 | write_lock_irq(&swapper_space.tree_lock); |