summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2022-10-25 21:38:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-08 19:58:33 +0200
commit27a72e350869d5b06cc44d882cd34fb0f88f3f8b (patch)
tree2e1dd0a166bf288e134cdba2c2fecaa884083785
parentd0317b9502ea8a8f66cd568e90f19b595b5d4a07 (diff)
x86/mm: Initialize text poking earlier
commit 5b93a83649c7cba3a15eb7e8959b250841acb1b1 upstream. 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@infradead.org> Link: https://lkml.kernel.org/r/20221025201057.881703081@infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--init/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 45b3a2beb383..63737af8de51 100644
--- a/init/main.c
+++ b/init/main.c
@@ -988,7 +988,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 */
@@ -1125,8 +1125,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
taskstats_init_early();
delayacct_init();
- poking_init();
-
acpi_subsystem_init();
arch_post_acpi_subsys_init();
kcsan_init();