summaryrefslogtreecommitdiffstats
path: root/init
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 20:03:49 +0200
commit051f5dcf144aa7659c4f4be04c66c3eda9b1bad3 (patch)
tree75c72f5dcb07a5e46712ee9c2fd0c3a116b80d72 /init
parente0fd83a193c530fdeced8b2e2ec83039ffdb884b (diff)
downloadlinux-stable-051f5dcf144aa7659c4f4be04c66c3eda9b1bad3.tar.gz
linux-stable-051f5dcf144aa7659c4f4be04c66c3eda9b1bad3.tar.bz2
linux-stable-051f5dcf144aa7659c4f4be04c66c3eda9b1bad3.zip
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>
Diffstat (limited to 'init')
-rw-r--r--init/main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 20e2d1d05973..fe378351e8a9 100644
--- a/init/main.c
+++ b/init/main.c
@@ -992,7 +992,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 */
@@ -1126,8 +1126,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();