aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memory.h6
-rw-r--r--mm/slub.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/memory.h b/include/linux/memory.h
index f80e0e331cb7..39628dfe4a4c 100644
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -53,6 +53,12 @@ struct memory_notify {
53struct notifier_block; 53struct notifier_block;
54struct mem_section; 54struct mem_section;
55 55
56/*
57 * Priorities for the hotplug memory callback routines (stored in decreasing
58 * order in the callback chain)
59 */
60#define SLAB_CALLBACK_PRI 1
61
56#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE 62#ifndef CONFIG_MEMORY_HOTPLUG_SPARSE
57static inline int memory_dev_init(void) 63static inline int memory_dev_init(void)
58{ 64{
diff --git a/mm/slub.c b/mm/slub.c
index 992ecd4f0d39..b145e798bf3d 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2978,7 +2978,7 @@ void __init kmem_cache_init(void)
2978 kmalloc_caches[0].refcount = -1; 2978 kmalloc_caches[0].refcount = -1;
2979 caches++; 2979 caches++;
2980 2980
2981 hotplug_memory_notifier(slab_memory_callback, 1); 2981 hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
2982#endif 2982#endif
2983 2983
2984 /* Able to allocate the per node structures */ 2984 /* Able to allocate the per node structures */