From 8a728ff9a3104d4d511f0f963bc892bf941a75f5 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 5 Nov 2005 17:25:53 +0100
Subject: [PATCH] --- yaml --- r: 14182 b: refs/heads/master c:
 b0d41693217b3bb5b837940dc7465e82a9d49476 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d2a477132db5..918cff9dd319 100644
--- 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
index 9b43511dbefd..e8810a7e0264 100644
--- 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;
 	}