Merge tag 'fixes-v3.18-not-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/mm/zswap.c b/mm/zswap.c
index 9da56af..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);
 }
@@ -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: