ARM: cns3xxx: fix allmodconfig panic in pci driver

[cascardo/linux.git] / mm / zswap.c

diff --git a/mm/zswap.c b/mm/zswap.c
index 032c21e..ea064c1 100644 (file)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -212,7 +212,7 @@ static int zswap_entry_cache_create(void)
        return zswap_entry_cache == NULL;
 }
 
-static void zswap_entry_cache_destory(void)
+static void __init zswap_entry_cache_destroy(void)
 {
        kmem_cache_destroy(zswap_entry_cache);
 }
@@ -507,7 +507,7 @@ static int zswap_get_swap_cache_page(swp_entry_t entry,
                 * add_to_swap_cache() doesn't return -EEXIST, so we can safely
                 * clear SWAP_HAS_CACHE flag.
                 */
-               swapcache_free(entry, NULL);
+               swapcache_free(entry);
        } while (err != -ENOMEM);
 
        if (new_page)
@@ -941,7 +941,7 @@ static int __init init_zswap(void)
 pcpufail:
        zswap_comp_exit();
 compfail:
-       zswap_entry_cache_destory();
+       zswap_entry_cache_destroy();
 cachefail:
        zpool_destroy_pool(zswap_pool);
 error: