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

Commit 7cc2a959 authored by Pavel Tatashin's avatar Pavel Tatashin Committed by Linus Torvalds
Browse files

mm: remove __paginginit 

__paginginit is the same thing as __meminit except for platforms without
sparsemem, there it is defined as __init.

Remove __paginginit and use __meminit.  Use __ref in one single function
that merges __meminit and __init sections: setup_usemap().

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


Signed-off-by: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
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 c1093b74

mm/internal.h

+0 −12
Original line number Diff line number Diff line
@@ -389,18 +389,6 @@ static inline struct page *mem_map_next(struct page *iter, 
	return iter + 1;

}



/*

 * FLATMEM and DISCONTIGMEM configurations use alloc_bootmem_node,

 * so all functions starting at paging_init should be marked __init

 * in those cases. SPARSEMEM, however, allows for memory hotplug,

 * and alloc_bootmem_node is not used.

 */

#ifdef CONFIG_SPARSEMEM

#define __paginginit __meminit

#else

#define __paginginit __init

#endif



/* Memory initialisation debug and verification */

enum mminit_level {

	MMINIT_WARNING,

mm/page_alloc.c

+10 −9
Original line number Diff line number Diff line
@@ -6120,7 +6120,7 @@ static unsigned long __init usemap_size(unsigned long zone_start_pfn, unsigned l 
	return usemapsize / 8;

}



static void __init setup_usemap(struct pglist_data *pgdat,

static void __ref setup_usemap(struct pglist_data *pgdat,

				struct zone *zone,

				unsigned long zone_start_pfn,

				unsigned long zonesize)
@@ -6140,7 +6140,7 @@ static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone, 
#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE



/* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */

void __paginginit set_pageblock_order(void)

void __meminit set_pageblock_order(void)

{

	unsigned int order;
@@ -6168,13 +6168,13 @@ void __paginginit set_pageblock_order(void) 
 * include/linux/pageblock-flags.h for the values of pageblock_order based on

 * the kernel config

 */

void __paginginit set_pageblock_order(void)

void __meminit set_pageblock_order(void)

{

}



#endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */



static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages,

static unsigned long __meminit calc_memmap_size(unsigned long spanned_pages,

						unsigned long present_pages)

{

	unsigned long pages = spanned_pages;
@@ -6233,7 +6233,7 @@ static void pgdat_init_kcompactd(struct pglist_data *pgdat) {} 
 *

 * NOTE: pgdat should get zeroed by caller.

 */

static void __paginginit free_area_init_core(struct pglist_data *pgdat)

static void __meminit free_area_init_core(struct pglist_data *pgdat)

{

	enum zone_type j;

	int nid = pgdat->node_id;
@@ -6364,8 +6364,9 @@ 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 */



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

		unsigned long node_start_pfn, unsigned long *zholes_size)

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

				   unsigned long node_start_pfn,

				   unsigned long *zholes_size)

{

	pg_data_t *pgdat = NODE_DATA(nid);

	unsigned long start_pfn = 0;
@@ -6410,7 +6411,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, 
 * may be accessed (for example page_to_pfn() on some configuration accesses

 * flags). We must explicitly zero those struct pages.

 */

void __paginginit zero_resv_unavail(void)

void __meminit zero_resv_unavail(void)

{

	phys_addr_t start, end;

	unsigned long pfn;