diff options
| -rw-r--r-- | include/linux/vmstat.h | 5 | ||||
| -rw-r--r-- | mm/page_alloc.c | 9 |
2 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 65efb92da996..ad2cfd53dadc 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h | |||
| @@ -179,11 +179,6 @@ extern void zone_statistics(struct zone *, struct zone *, gfp_t gfp); | |||
| 179 | #define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d) | 179 | #define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d) |
| 180 | #define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d)) | 180 | #define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d)) |
| 181 | 181 | ||
| 182 | static inline void zap_zone_vm_stats(struct zone *zone) | ||
| 183 | { | ||
| 184 | memset(zone->vm_stat, 0, sizeof(zone->vm_stat)); | ||
| 185 | } | ||
| 186 | |||
| 187 | extern void inc_zone_state(struct zone *, enum zone_stat_item); | 182 | extern void inc_zone_state(struct zone *, enum zone_stat_item); |
| 188 | 183 | ||
| 189 | #ifdef CONFIG_SMP | 184 | #ifdef CONFIG_SMP |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a6f7576aecae..889532b8e6c1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -4377,6 +4377,8 @@ void __init set_pageblock_order(void) | |||
| 4377 | * - mark all pages reserved | 4377 | * - mark all pages reserved |
| 4378 | * - mark all memory queues empty | 4378 | * - mark all memory queues empty |
| 4379 | * - clear the memory bitmaps | 4379 | * - clear the memory bitmaps |
| 4380 | * | ||
| 4381 | * NOTE: pgdat should get zeroed by caller. | ||
| 4380 | */ | 4382 | */ |
| 4381 | static void __paginginit free_area_init_core(struct pglist_data *pgdat, | 4383 | static void __paginginit free_area_init_core(struct pglist_data *pgdat, |
| 4382 | unsigned long *zones_size, unsigned long *zholes_size) | 4384 | unsigned long *zones_size, unsigned long *zholes_size) |
| @@ -4387,10 +4389,8 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, | |||
| 4387 | int ret; | 4389 | int ret; |
| 4388 | 4390 | ||
| 4389 | pgdat_resize_init(pgdat); | 4391 | pgdat_resize_init(pgdat); |
| 4390 | pgdat->nr_zones = 0; | ||
| 4391 | init_waitqueue_head(&pgdat->kswapd_wait); | 4392 | init_waitqueue_head(&pgdat->kswapd_wait); |
| 4392 | init_waitqueue_head(&pgdat->pfmemalloc_wait); | 4393 | init_waitqueue_head(&pgdat->pfmemalloc_wait); |
| 4393 | pgdat->kswapd_max_order = 0; | ||
| 4394 | pgdat_page_cgroup_init(pgdat); | 4394 | pgdat_page_cgroup_init(pgdat); |
| 4395 | 4395 | ||
| 4396 | for (j = 0; j < MAX_NR_ZONES; j++) { | 4396 | for (j = 0; j < MAX_NR_ZONES; j++) { |
| @@ -4451,11 +4451,6 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, | |||
| 4451 | 4451 | ||
| 4452 | zone_pcp_init(zone); | 4452 | zone_pcp_init(zone); |
| 4453 | lruvec_init(&zone->lruvec, zone); | 4453 | lruvec_init(&zone->lruvec, zone); |
| 4454 | zap_zone_vm_stats(zone); | ||
| 4455 | zone->flags = 0; | ||
| 4456 | #ifdef CONFIG_MEMORY_ISOLATION | ||
| 4457 | zone->nr_pageblock_isolate = 0; | ||
| 4458 | #endif | ||
| 4459 | if (!size) | 4454 | if (!size) |
| 4460 | continue; | 4455 | continue; |
| 4461 | 4456 | ||
