pinctrl: pfc: r8a7790: add i2c0 muxing

[firefly-linux-kernel-4.4.55.git] / mm / zswap.c

diff --git a/mm/zswap.c b/mm/zswap.c
index c0c9b7c80c054dc35b34d3754222d03e7762ffab..aeaef0fb562400093a91517e9ce62ca63cb94bed 100644 (file)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -204,7 +204,7 @@ static struct kmem_cache *zswap_entry_cache;
 static int zswap_entry_cache_create(void)
 {
        zswap_entry_cache = KMEM_CACHE(zswap_entry, 0);
-       return (zswap_entry_cache == NULL);
+       return zswap_entry_cache == NULL;
 }
 
 static void zswap_entry_cache_destory(void)
@@ -388,18 +388,18 @@ static int zswap_cpu_init(void)
 {
        unsigned long cpu;
 
-       get_online_cpus();
+       cpu_notifier_register_begin();
        for_each_online_cpu(cpu)
                if (__zswap_cpu_notifier(CPU_UP_PREPARE, cpu) != NOTIFY_OK)
                        goto cleanup;
-       register_cpu_notifier(&zswap_cpu_notifier_block);
-       put_online_cpus();
+       __register_cpu_notifier(&zswap_cpu_notifier_block);
+       cpu_notifier_register_done();
        return 0;
 
 cleanup:
        for_each_online_cpu(cpu)
                __zswap_cpu_notifier(CPU_UP_CANCELED, cpu);
-       put_online_cpus();
+       cpu_notifier_register_done();
        return -ENOMEM;
 }
 
@@ -408,8 +408,8 @@ cleanup:
 **********************************/
 static bool zswap_is_full(void)
 {
-       return (totalram_pages * zswap_max_pool_percent / 100 <
-               zswap_pool_pages);
+       return totalram_pages * zswap_max_pool_percent / 100 <
+               zswap_pool_pages;
 }
 
 /*********************************