Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

[karo-tx-linux.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 78cfa292a29aa0780e5e83efd7b7733ce958e605..2657accc6e2b9c6a6a5c242cf8cd1629441b1f36 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2724,7 +2724,6 @@ int swapcache_prepare(swp_entry_t entry)
 struct swap_info_struct *page_swap_info(struct page *page)
 {
        swp_entry_t swap = { .val = page_private(page) };
-       BUG_ON(!PageSwapCache(page));
        return swap_info[swp_type(swap)];
 }