Skip to content

Commit 051f5dc

Browse files
Peter Zijlstragregkh
authored andcommitted
x86/mm: Initialize text poking earlier
commit 5b93a83 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) <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e0fd83a commit 051f5dc

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

init/main.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
992992
sort_main_extable();
993993
trap_init();
994994
mm_init();
995-
995+
poking_init();
996996
ftrace_init();
997997

998998
/* trace_printk can be enabled here */
@@ -1126,8 +1126,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
11261126
taskstats_init_early();
11271127
delayacct_init();
11281128

1129-
poking_init();
1130-
11311129
acpi_subsystem_init();
11321130
arch_post_acpi_subsys_init();
11331131
kcsan_init();

0 commit comments

Comments
 (0)