summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2022-10-25 22:38:25 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-08 20:57:39 +0300
commit79972c2b95eca5e7d3d237d728339b21e9075629 (patch)
tree832345fd325dae35149c6affe9d4f21a72265bb5
parent1ff14defdfc9180bfcfd76a70463a5feb188a5db (diff)
downloadlinux-79972c2b95eca5e7d3d237d728339b21e9075629.tar.xz
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 402d290f0fc4..298989b0d4e8 100644
--- a/init/main.c
+++ b/init/main.c
@@ -900,7 +900,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 */
@@ -1035,8 +1035,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();
sfi_init_late();