iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm/page_alloc.c: drop uneeded __meminit and __meminitdata

Browse Source 
Since commit 03e85f9d5f1 ("mm/page_alloc: Introduce
free_area_init_core_hotplug"), some functions changed to only be called
during system initialization.  Concretly, free_area_init_node() and the
functions that hang from it.

Also, some variables are no longer used after the system has gone
through initialization.  So this could be considered as a late clean-up
for that patch.

This patch changes the functions from __meminit to __init, and the
variables from __meminitdata to __initdata.

In return, we get some KBs back:

Before:
  Freeing unused kernel image memory: 2472K

After:
  Freeing unused kernel image memory: 2480K

Link: http://lkml.kernel.org/r/20181204111507.4808-1-osalvador@suse.de
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Pavel Tatashin <pavel.tatashin@microsoft.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oscar Salvador 2018-12-28 00:37:24 -08:00 committed by Linus Torvalds
parent 3fa750dcf2
commit bbe5d9939e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mm/page_alloc.c
View File

@ -265,18 +265,18 @@ int user_min_free_kbytes = -1;
int watermark_boost_factor __read_mostly = 15000; int watermark_boost_factor __read_mostly = 15000;
int watermark_scale_factor = 10; int watermark_scale_factor = 10;
static unsigned long nr_kernel_pages __meminitdata; static unsigned long nr_kernel_pages __initdata;
static unsigned long nr_all_pages __meminitdata; static unsigned long nr_all_pages __initdata;
static unsigned long dma_reserve __meminitdata; static unsigned long dma_reserve __initdata;
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
static unsigned long arch_zone_lowest_possible_pfn[MAX_NR_ZONES] __meminitdata; static unsigned long arch_zone_lowest_possible_pfn[MAX_NR_ZONES] __initdata;
static unsigned long arch_zone_highest_possible_pfn[MAX_NR_ZONES] __meminitdata; static unsigned long arch_zone_highest_possible_pfn[MAX_NR_ZONES] __initdata;
static unsigned long required_kernelcore __initdata; static unsigned long required_kernelcore __initdata;
static unsigned long required_kernelcore_percent __initdata; static unsigned long required_kernelcore_percent __initdata;
static unsigned long required_movablecore __initdata; static unsigned long required_movablecore __initdata;
static unsigned long required_movablecore_percent __initdata; static unsigned long required_movablecore_percent __initdata;
static unsigned long zone_movable_pfn[MAX_NUMNODES] __meminitdata; static unsigned long zone_movable_pfn[MAX_NUMNODES] __initdata;
static bool mirrored_kernelcore __meminitdata; static bool mirrored_kernelcore __meminitdata;
/* movable_zone is the "real" zone pages in ZONE_MOVABLE are taken from */ /* movable_zone is the "real" zone pages in ZONE_MOVABLE are taken from */
@ -6034,7 +6034,7 @@ void __init sparse_memory_present_with_active_regions(int nid)
* with no available memory, a warning is printed and the start and end * with no available memory, a warning is printed and the start and end
* PFNs will be 0. * PFNs will be 0.
*/ */
void __meminit get_pfn_range_for_nid(unsigned int nid, void __init get_pfn_range_for_nid(unsigned int nid,
unsigned long *start_pfn, unsigned long *end_pfn) unsigned long *start_pfn, unsigned long *end_pfn)
{ {
unsigned long this_start_pfn, this_end_pfn; unsigned long this_start_pfn, this_end_pfn;
@ -6083,7 +6083,7 @@ static void __init find_usable_zone_for_movable(void)
* highest usable zone for ZONE_MOVABLE. This preserves the assumption that * highest usable zone for ZONE_MOVABLE. This preserves the assumption that
* zones within a node are in order of monotonic increases memory addresses * zones within a node are in order of monotonic increases memory addresses
*/ */
static void __meminit adjust_zone_range_for_zone_movable(int nid, static void __init adjust_zone_range_for_zone_movable(int nid,
unsigned long zone_type, unsigned long zone_type,
unsigned long node_start_pfn, unsigned long node_start_pfn,
unsigned long node_end_pfn, unsigned long node_end_pfn,
@ -6114,7 +6114,7 @@ static void __meminit adjust_zone_range_for_zone_movable(int nid,
* Return the number of pages a zone spans in a node, including holes * Return the number of pages a zone spans in a node, including holes
* present_pages = zone_spanned_pages_in_node() - zone_absent_pages_in_node() * present_pages = zone_spanned_pages_in_node() - zone_absent_pages_in_node()
*/ */
static unsigned long __meminit zone_spanned_pages_in_node(int nid, static unsigned long __init zone_spanned_pages_in_node(int nid,
unsigned long zone_type, unsigned long zone_type,
unsigned long node_start_pfn, unsigned long node_start_pfn,
unsigned long node_end_pfn, unsigned long node_end_pfn,
@ -6149,7 +6149,7 @@ static unsigned long __meminit zone_spanned_pages_in_node(int nid,
* Return the number of holes in a range on a node. If nid is MAX_NUMNODES, * Return the number of holes in a range on a node. If nid is MAX_NUMNODES,
* then all holes in the requested range will be accounted for. * then all holes in the requested range will be accounted for.
*/ */
unsigned long __meminit __absent_pages_in_range(int nid, unsigned long __init __absent_pages_in_range(int nid,
unsigned long range_start_pfn, unsigned long range_start_pfn,
unsigned long range_end_pfn) unsigned long range_end_pfn)
{ {
@ -6179,7 +6179,7 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn,
} }
/* Return the number of page frames in holes in a zone on a node */ /* Return the number of page frames in holes in a zone on a node */
static unsigned long __meminit zone_absent_pages_in_node(int nid, static unsigned long __init zone_absent_pages_in_node(int nid,
unsigned long zone_type, unsigned long zone_type,
unsigned long node_start_pfn, unsigned long node_start_pfn,
unsigned long node_end_pfn, unsigned long node_end_pfn,
@ -6231,7 +6231,7 @@ static unsigned long __meminit zone_absent_pages_in_node(int nid,
} }
#else /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ #else /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
static inline unsigned long __meminit zone_spanned_pages_in_node(int nid, static inline unsigned long __init zone_spanned_pages_in_node(int nid,
unsigned long zone_type, unsigned long zone_type,
unsigned long node_start_pfn, unsigned long node_start_pfn,
unsigned long node_end_pfn, unsigned long node_end_pfn,
@ -6250,7 +6250,7 @@ static inline unsigned long __meminit zone_spanned_pages_in_node(int nid,
return zones_size[zone_type]; return zones_size[zone_type];
} }
static inline unsigned long __meminit zone_absent_pages_in_node(int nid, static inline unsigned long __init zone_absent_pages_in_node(int nid,
unsigned long zone_type, unsigned long zone_type,
unsigned long node_start_pfn, unsigned long node_start_pfn,
unsigned long node_end_pfn, unsigned long node_end_pfn,
@ -6264,7 +6264,7 @@ static inline unsigned long __meminit zone_absent_pages_in_node(int nid,
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ #endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
static void __meminit calculate_node_totalpages(struct pglist_data *pgdat, static void __init calculate_node_totalpages(struct pglist_data *pgdat,
unsigned long node_start_pfn, unsigned long node_start_pfn,
unsigned long node_end_pfn, unsigned long node_end_pfn,
unsigned long *zones_size, unsigned long *zones_size,