diff --git a/[refs] b/[refs] index f00b17cb30a8..b021631fe19b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7e12b838989b0e432c7a1cdf1e6c6fd936007f6 +refs/heads/master: 941c7105dc4f4961727acc518e18e00b9a03cbf3 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index b55bb358b832..bf2f6cff1d6a 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -853,7 +853,7 @@ static struct page *buffered_rmqueue(struct zonelist *zonelist, pcp = &zone_pcp(zone, cpu)->pcp[cold]; local_irq_save(flags); if (!pcp->count) { - pcp->count += rmqueue_bulk(zone, 0, + pcp->count = rmqueue_bulk(zone, 0, pcp->batch, &pcp->list); if (unlikely(!pcp->count)) goto failed;