diff --git a/[refs] b/[refs] index bc12e4a06b72..239f05a1573d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5f541ed6e31518508c688912e7464facf253c87 +refs/heads/master: 66a550308b8e4cbaba185d0326cb05d1bd758101 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index d0432e44f77d..490aee1f2ce8 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1829,6 +1829,9 @@ static int __cpuinit process_zones(int cpu) for_each_zone(zone) { + if (!populated_zone(zone)) + continue; + zone_pcp(zone, cpu) = kmalloc_node(sizeof(struct per_cpu_pageset), GFP_KERNEL, cpu_to_node(cpu)); if (!zone_pcp(zone, cpu))