summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-11-05 17:25:53 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-14 19:55:13 -0800
commitb0d41693217b3bb5b837940dc7465e82a9d49476 (patch)
tree965dbdfea6644d57fd107619b2ea9e0c9ec6bdc1 /mm
parentfed644132f8ec4bf05b63f79c507c0acaa692c37 (diff)
downloadlinux-b0d41693217b3bb5b837940dc7465e82a9d49476.tar.gz
linux-b0d41693217b3bb5b837940dc7465e82a9d49476.tar.bz2
linux-b0d41693217b3bb5b837940dc7465e82a9d49476.zip
[PATCH] x86_64: When cpu_up fails clean up page allocator properly
Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 9b43511dbefd..e8810a7e0264 100644
--- a/mm/page_alloc.c
+++ b/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;
}