[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>

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;
         }