From 8863ea7e77341637d6998f8b1fd17b73bededb37 Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Fri, 22 Feb 2013 16:33:54 -0800 Subject: [PATCH] --- yaml --- r: 356543 b: refs/heads/master c: 306f2e9eed173c5b8f3318e36cf92a7df3c3f6d5 h: refs/heads/master i: 356541: 37b3e5b8851de2f6bb0797d8f6610957d2b677d3 356539: e03c9e90242dceafa41ef01bce2b576696c145b0 356535: 518e0d43f0e7f3838660783c10068f1d6c4c95f7 356527: c3e046dec8115bac9a8d44163f20871ebb49807a 356511: 85254c7cd879d4e13aadc64b85ee199e052d4748 356479: d8827093bd6f65a286a36b10efaa6badf49690bd v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 96274f9c331a..7a3f89e22734 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b40da04946aa7b603b2aa4dd479f83b2c9090d96 +refs/heads/master: 306f2e9eed173c5b8f3318e36cf92a7df3c3f6d5 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 5f73106bd8dd..07fe78d01ffd 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -4650,7 +4650,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, nr_all_pages += freesize; zone->spanned_pages = size; - zone->present_pages = freesize; + zone->present_pages = realsize; /* * Set an approximate value for lowmem here, it will be adjusted * when the bootmem allocator frees pages into the buddy system.