diff --git a/[refs] b/[refs] index 9a1a46597f42..7c69d168a84a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b28a02de8c70d41d6b6ba8911e83ed3ccf2e13f8 +refs/heads/master: bec6b0c89b234090681a4516e20ac5debe3e7c59 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 0b98f428b07b..5eeeadd9f66a 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1883,7 +1883,6 @@ static int __devinit process_zones(int cpu) static inline void free_zone_pagesets(int cpu) { -#ifdef CONFIG_NUMA struct zone *zone; for_each_zone(zone) { @@ -1892,7 +1891,6 @@ static inline void free_zone_pagesets(int cpu) zone_pcp(zone, cpu) = NULL; kfree(pset); } -#endif } static int __devinit pageset_cpuup_callback(struct notifier_block *nfb,