Skip to content

Commit bbe5d99

Browse files
osalvadorvilardagatorvalds
authored andcommitted
mm/page_alloc.c: drop uneeded __meminit and __meminitdata
Since commit 03e85f9 ("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/[email protected] Signed-off-by: Oscar Salvador <[email protected]> Reviewed-by: Wei Yang <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Pavel Tatashin <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Alexander Duyck <[email protected]> Cc: David Hildenbrand <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 3fa750d commit bbe5d99

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

mm/page_alloc.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -265,18 +265,18 @@ int user_min_free_kbytes = -1;
265265
int watermark_boost_factor __read_mostly = 15000;
266266
int watermark_scale_factor = 10;
267267

268-
static unsigned long nr_kernel_pages __meminitdata;
269-
static unsigned long nr_all_pages __meminitdata;
270-
static unsigned long dma_reserve __meminitdata;
268+
static unsigned long nr_kernel_pages __initdata;
269+
static unsigned long nr_all_pages __initdata;
270+
static unsigned long dma_reserve __initdata;
271271

272272
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
273-
static unsigned long arch_zone_lowest_possible_pfn[MAX_NR_ZONES] __meminitdata;
274-
static unsigned long arch_zone_highest_possible_pfn[MAX_NR_ZONES] __meminitdata;
273+
static unsigned long arch_zone_lowest_possible_pfn[MAX_NR_ZONES] __initdata;
274+
static unsigned long arch_zone_highest_possible_pfn[MAX_NR_ZONES] __initdata;
275275
static unsigned long required_kernelcore __initdata;
276276
static unsigned long required_kernelcore_percent __initdata;
277277
static unsigned long required_movablecore __initdata;
278278
static unsigned long required_movablecore_percent __initdata;
279-
static unsigned long zone_movable_pfn[MAX_NUMNODES] __meminitdata;
279+
static unsigned long zone_movable_pfn[MAX_NUMNODES] __initdata;
280280
static bool mirrored_kernelcore __meminitdata;
281281

282282
/* 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)
60346034
* with no available memory, a warning is printed and the start and end
60356035
* PFNs will be 0.
60366036
*/
6037-
void __meminit get_pfn_range_for_nid(unsigned int nid,
6037+
void __init get_pfn_range_for_nid(unsigned int nid,
60386038
unsigned long *start_pfn, unsigned long *end_pfn)
60396039
{
60406040
unsigned long this_start_pfn, this_end_pfn;
@@ -6083,7 +6083,7 @@ static void __init find_usable_zone_for_movable(void)
60836083
* highest usable zone for ZONE_MOVABLE. This preserves the assumption that
60846084
* zones within a node are in order of monotonic increases memory addresses
60856085
*/
6086-
static void __meminit adjust_zone_range_for_zone_movable(int nid,
6086+
static void __init adjust_zone_range_for_zone_movable(int nid,
60876087
unsigned long zone_type,
60886088
unsigned long node_start_pfn,
60896089
unsigned long node_end_pfn,
@@ -6114,7 +6114,7 @@ static void __meminit adjust_zone_range_for_zone_movable(int nid,
61146114
* Return the number of pages a zone spans in a node, including holes
61156115
* present_pages = zone_spanned_pages_in_node() - zone_absent_pages_in_node()
61166116
*/
6117-
static unsigned long __meminit zone_spanned_pages_in_node(int nid,
6117+
static unsigned long __init zone_spanned_pages_in_node(int nid,
61186118
unsigned long zone_type,
61196119
unsigned long node_start_pfn,
61206120
unsigned long node_end_pfn,
@@ -6149,7 +6149,7 @@ static unsigned long __meminit zone_spanned_pages_in_node(int nid,
61496149
* Return the number of holes in a range on a node. If nid is MAX_NUMNODES,
61506150
* then all holes in the requested range will be accounted for.
61516151
*/
6152-
unsigned long __meminit __absent_pages_in_range(int nid,
6152+
unsigned long __init __absent_pages_in_range(int nid,
61536153
unsigned long range_start_pfn,
61546154
unsigned long range_end_pfn)
61556155
{
@@ -6179,7 +6179,7 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn,
61796179
}
61806180

61816181
/* Return the number of page frames in holes in a zone on a node */
6182-
static unsigned long __meminit zone_absent_pages_in_node(int nid,
6182+
static unsigned long __init zone_absent_pages_in_node(int nid,
61836183
unsigned long zone_type,
61846184
unsigned long node_start_pfn,
61856185
unsigned long node_end_pfn,
@@ -6231,7 +6231,7 @@ static unsigned long __meminit zone_absent_pages_in_node(int nid,
62316231
}
62326232

62336233
#else /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
6234-
static inline unsigned long __meminit zone_spanned_pages_in_node(int nid,
6234+
static inline unsigned long __init zone_spanned_pages_in_node(int nid,
62356235
unsigned long zone_type,
62366236
unsigned long node_start_pfn,
62376237
unsigned long node_end_pfn,
@@ -6250,7 +6250,7 @@ static inline unsigned long __meminit zone_spanned_pages_in_node(int nid,
62506250
return zones_size[zone_type];
62516251
}
62526252

6253-
static inline unsigned long __meminit zone_absent_pages_in_node(int nid,
6253+
static inline unsigned long __init zone_absent_pages_in_node(int nid,
62546254
unsigned long zone_type,
62556255
unsigned long node_start_pfn,
62566256
unsigned long node_end_pfn,
@@ -6264,7 +6264,7 @@ static inline unsigned long __meminit zone_absent_pages_in_node(int nid,
62646264

62656265
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
62666266

6267-
static void __meminit calculate_node_totalpages(struct pglist_data *pgdat,
6267+
static void __init calculate_node_totalpages(struct pglist_data *pgdat,
62686268
unsigned long node_start_pfn,
62696269
unsigned long node_end_pfn,
62706270
unsigned long *zones_size,

0 commit comments

Comments
 (0)