mm/swap_slots.c: don't disable preemption while taking the per-CPU cache

[mirror_ubuntu-artful-kernel.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 01a0fe2eb33267f8f04f7e90fd79358cd1f41d07..904a83be82de81a24a73adfac8e573db32f7118a 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -47,13 +47,12 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work,
 
 /*
  * Merge control. If this is set then no merging of slab caches will occur.
- * (Could be removed. This was introduced to pacify the merge skeptics.)
  */
-static int slab_nomerge;
+static bool slab_nomerge = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
 
 static int __init setup_slab_nomerge(char *str)
 {
-       slab_nomerge = 1;
+       slab_nomerge = true;
        return 1;
 }