---

yaml --- r: 338738 b: refs/heads/master c: b9d5ab2 h: refs/heads/master v: v3
git-mirror · Dec 12, 2012 · 02ba62f · 02ba62f
1 parent 1ffa022
commit 02ba62f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9713679dbd2a6ecb840cd5b65a3ec555c1ec3d4
+refs/heads/master: b9d5ab2562eceeada5e4837a621b6260574dd11d
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -3573,7 +3573,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
@@ -3606,7 +3606,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;
 
 	/*