Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penber...

[karo-tx-linux.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index 9640edd2cc78e067acd29432b44ba8e19e5ff815..87f9f32bf0cd86351ba4893bae66d64ff31e06c3 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3493,7 +3493,7 @@ static void slab_mem_offline_callback(void *arg)
        struct memory_notify *marg = arg;
        int offline_node;
 
-       offline_node = marg->status_change_nid;
+       offline_node = marg->status_change_nid_normal;
 
        /*
         * If the node still has available memory. we need kmem_cache_node
@@ -3526,7 +3526,7 @@ static int slab_mem_going_online_callback(void *arg)
        struct kmem_cache_node *n;
        struct kmem_cache *s;
        struct memory_notify *marg = arg;
-       int nid = marg->status_change_nid;
+       int nid = marg->status_change_nid_normal;
        int ret = 0;
 
        /*