The patch titled Subject: mm/page_alloc.c: pull out init code from build_all_zonelists has been removed from the -mm tree. Its filename was mm-page_allocc-pull-out-init-code-from-build_all_zonelists.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Subject: mm/page_alloc.c: pull out init code from build_all_zonelists Pulling the code protected by if (system_state == SYSTEM_BOOTING) into its own helper allows us to shrink .text a little. This relies on build_all_zonelists already having a __ref annotation. Add a comment explaining why so one doesn't have to track it down through git log. The real saving comes in 3/5, ("mm/mm_init.c: Mark mminit_verify_zonelist as __init"), where we save about 400 bytes Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Vishnu Pratap Singh <vishnu.ps@xxxxxxxxxxx> Cc: Pintu Kumar <pintu.k@xxxxxxxxxxx> Cc: Michal Nazarewicz <mina86@xxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Tim Chen <tim.c.chen@xxxxxxxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Li Zefan <lizefan@xxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff -puN mm/page_alloc.c~mm-page_allocc-pull-out-init-code-from-build_all_zonelists mm/page_alloc.c --- a/mm/page_alloc.c~mm-page_allocc-pull-out-init-code-from-build_all_zonelists +++ a/mm/page_alloc.c @@ -3871,18 +3871,29 @@ static int __build_all_zonelists(void *d return 0; } +static noinline void __init +build_all_zonelists_init(void) +{ + __build_all_zonelists(NULL); + mminit_verify_zonelist(); + cpuset_init_current_mems_allowed(); +} + /* * Called with zonelists_mutex held always * unless system_state == SYSTEM_BOOTING. + * + * __ref due to (1) call of __meminit annotated setup_zone_pageset + * [we're only called with non-NULL zone through __meminit paths] and + * (2) call of __init annotated helper build_all_zonelists_init + * [protected by SYSTEM_BOOTING]. */ void __ref build_all_zonelists(pg_data_t *pgdat, struct zone *zone) { set_zonelist_order(); if (system_state == SYSTEM_BOOTING) { - __build_all_zonelists(NULL); - mminit_verify_zonelist(); - cpuset_init_current_mems_allowed(); + build_all_zonelists_init(); } else { #ifdef CONFIG_MEMORY_HOTPLUG if (zone) _ Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxx are origin.patch lib-bitmapc-change-prototype-of-bitmap_copy_le.patch lib-bitmapc-elide-bitmap_copy_le-on-little-endian.patch lib-bitmap-change-bitmap_shift_right-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_right.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_right.patch lib-bitmap-yet-another-simplification-in-__bitmap_shift_right.patch lib-bitmap-change-bitmap_shift_left-to-take-unsigned-parameters.patch lib-bitmap-eliminate-branch-in-__bitmap_shift_left.patch lib-bitmap-remove-redundant-code-from-__bitmap_shift_left.patch lib-stringc-improve-strrchr.patch checkpatch-emit-an-error-when-using-predefined-timestamp-macros.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html