---

yaml --- r: 14182 b: refs/heads/master c: b0d4169 h: refs/heads/master v: v3
git-mirror · Nov 15, 2005 · 8a728ff · 8a728ff
1 parent ecdf6db
commit 8a728ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fed644132f8ec4bf05b63f79c507c0acaa692c37
+refs/heads/master: b0d41693217b3bb5b837940dc7465e82a9d49476
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1876,11 +1876,10 @@ static int __devinit pageset_cpuup_callback(struct notifier_block *nfb,
 			if (process_zones(cpu))
 				ret = NOTIFY_BAD;
 			break;
-#ifdef CONFIG_HOTPLUG_CPU
+		case CPU_UP_CANCELED:
 		case CPU_DEAD:
 			free_zone_pagesets(cpu);
 			break;
-#endif
 		default:
 			break;
 	}