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

Commit 0188dc98 authored by Oscar Salvador's avatar Oscar Salvador Committed by Linus Torvalds
Browse files

mm/page_alloc: inline function to handle CONFIG_DEFERRED_STRUCT_PAGE_INIT 

Let us move the code between CONFIG_DEFERRED_STRUCT_PAGE_INIT to an inline
function.  Not having an ifdef in the function makes the code more
readable.

Link: http://lkml.kernel.org/r/20180730101757.28058-4-osalvador@techadventures.net


Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Aaron Lu <aaron.lu@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Pasha Tatashin <Pavel.Tatashin@microsoft.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7cc2a959

mm/page_alloc.c

+16 −9
Original line number Diff line number Diff line
@@ -6364,6 +6364,21 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat) 
static void __ref alloc_node_mem_map(struct pglist_data *pgdat) { }

#endif /* CONFIG_FLAT_NODE_MEM_MAP */



#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

static inline void pgdat_set_deferred_range(pg_data_t *pgdat)

{

	/*

	 * We start only with one section of pages, more pages are added as

	 * needed until the rest of deferred pages are initialized.

	 */

	pgdat->static_init_pgcnt = min_t(unsigned long, PAGES_PER_SECTION,

						pgdat->node_spanned_pages);

	pgdat->first_deferred_pfn = ULONG_MAX;

}

#else

static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {}

#endif



void __meminit free_area_init_node(int nid, unsigned long *zones_size,

				   unsigned long node_start_pfn,

				   unsigned long *zholes_size)
@@ -6390,16 +6405,8 @@ void __meminit free_area_init_node(int nid, unsigned long *zones_size, 
				  zones_size, zholes_size);



	alloc_node_mem_map(pgdat);

	pgdat_set_deferred_range(pgdat);



#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

	/*

	 * We start only with one section of pages, more pages are added as

	 * needed until the rest of deferred pages are initialized.

	 */

	pgdat->static_init_pgcnt = min_t(unsigned long, PAGES_PER_SECTION,

					 pgdat->node_spanned_pages);

	pgdat->first_deferred_pfn = ULONG_MAX;

#endif

	free_area_init_core(pgdat);

}