Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6527af5d authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

mm: remove redundant initialization 



pg_data_t is zeroed before reaching free_area_init_core(), so remove the
now unnecessary initializations.

Signed-off-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 88fdf75d

include/linux/vmstat.h

+0 −5
Original line number Diff line number Diff line
@@ -179,11 +179,6 @@ extern void zone_statistics(struct zone *, struct zone *, gfp_t gfp); 
#define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d)

#define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d))



static inline void zap_zone_vm_stats(struct zone *zone)

{

	memset(zone->vm_stat, 0, sizeof(zone->vm_stat));

}



extern void inc_zone_state(struct zone *, enum zone_stat_item);



#ifdef CONFIG_SMP

mm/page_alloc.c

+2 −7
Original line number Diff line number Diff line
@@ -4377,6 +4377,8 @@ void __init set_pageblock_order(void) 
 *   - mark all pages reserved

 *   - mark all memory queues empty

 *   - clear the memory bitmaps

 *

 * NOTE: pgdat should get zeroed by caller.

 */

static void __paginginit free_area_init_core(struct pglist_data *pgdat,

		unsigned long *zones_size, unsigned long *zholes_size)
@@ -4387,10 +4389,8 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, 
	int ret;



	pgdat_resize_init(pgdat);

	pgdat->nr_zones = 0;

	init_waitqueue_head(&pgdat->kswapd_wait);

	init_waitqueue_head(&pgdat->pfmemalloc_wait);

	pgdat->kswapd_max_order = 0;

	pgdat_page_cgroup_init(pgdat);



	for (j = 0; j < MAX_NR_ZONES; j++) {
@@ -4451,11 +4451,6 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, 


		zone_pcp_init(zone);

		lruvec_init(&zone->lruvec, zone);

		zap_zone_vm_stats(zone);

		zone->flags = 0;

#ifdef CONFIG_MEMORY_ISOLATION

		zone->nr_pageblock_isolate = 0;

#endif

		if (!size)

			continue;