The following commit has been merged into the x86/mm branch of tip: Commit-ID: 5b93a83649c7cba3a15eb7e8959b250841acb1b1 Gitweb: https://git.kernel.org/tip/5b93a83649c7cba3a15eb7e8959b250841acb1b1 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Tue, 25 Oct 2022 21:38:25 +02:00 Committer: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> CommitterDate: Thu, 15 Dec 2022 10:37:26 -08:00 x86/mm: Initialize text poking earlier Move poking_init() up a bunch; specifically move it right after mm_init() which is right before ftrace_init(). This will allow simplifying ftrace text poking which currently has a bunch of exceptions for early boot. Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20221025201057.881703081@xxxxxxxxxxxxx --- init/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/init/main.c b/init/main.c index f1d1a54..5372ea2 100644 --- a/init/main.c +++ b/init/main.c @@ -996,7 +996,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) sort_main_extable(); trap_init(); mm_init(); - + poking_init(); ftrace_init(); /* trace_printk can be enabled here */ @@ -1135,7 +1135,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) taskstats_init_early(); delayacct_init(); - poking_init(); check_bugs(); acpi_subsystem_init();
|