---

yaml --- r: 361675 b: refs/heads/master c: ca4b3f3 h: refs/heads/master i: 361673: 6a6dfbc 361671: 1de0edc v: v3
git-mirror · Mar 22, 2013 · 58df6cc · 58df6cc
1 parent f5ad14f
commit 58df6cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96e7d7a1e0fc7780b4c1981c787e42473aa91a95
+refs/heads/master: ca4b3f302c90de5e516296e581c31c80125cd24b
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
@@ -1779,7 +1779,11 @@ void try_offline_node(int nid)
 	for (i = 0; i < MAX_NR_ZONES; i++) {
 		struct zone *zone = pgdat->node_zones + i;
 
-		if (zone->wait_table)
+		/*
+		 * wait_table may be allocated from boot memory,
+		 * here only free if it's allocated by vmalloc.
+		 */
+		if (is_vmalloc_addr(zone->wait_table))
 			vfree(zone->wait_table);
 	}