change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/init/main.c
..
..
@@ -96,13 +96,11 @@
96
96
 #include <linux/cache.h>
97
97
 #include <linux/rodata_test.h>
98
98
 #include <linux/jump_label.h>
99
-#include <linux/mem_encrypt.h>
100
99
 #include <linux/kcsan.h>
101
100
 #include <linux/init_syscalls.h>
102
101
 #include <linux/stackdepot.h>
103
102
 
104
103
 #include <asm/io.h>
105
-#include <asm/bugs.h>
106
104
 #include <asm/setup.h>
107
105
 #include <asm/sections.h>
108
106
 #include <asm/cacheflush.h>
..
..
@@ -766,8 +764,6 @@
766
764
 }
767
765
 #endif
768
766
 
769
-void __init __weak mem_encrypt_init(void) { }
770
-
771
767
 void __init __weak poking_init(void) { }
772
768
 
773
769
 void __init __weak pgtable_cache_init(void) { }
..
..
@@ -835,6 +831,7 @@
835
831
 	init_espfix_bsp();
836
832
 	/* Should be run after espfix64 is set up. */
837
833
 	pti_init();
834
+	mm_cache_init();
838
835
 }
839
836
 
840
837
 void __init __weak arch_call_rest_init(void)
..
..
@@ -915,7 +912,7 @@
915
912
 	sort_main_extable();
916
913
 	trap_init();
917
914
 	mm_init();
918
-
915
+	poking_init();
919
916
 	ftrace_init();
920
917
 
921
918
 	/* trace_printk can be enabled here */
..
..
@@ -1006,14 +1003,6 @@
1006
1003
 	 */
1007
1004
 	locking_selftest();
1008
1005
 
1009
-	/*
1010
-	 * This needs to be called before any devices perform DMA
1011
-	 * operations that might use the SWIOTLB bounce buffers. It will
1012
-	 * mark the bounce buffers as decrypted so that their usage will
1013
-	 * not cause "plain-text" data to be decrypted when accessed.
1014
-	 */
1015
-	mem_encrypt_init();
1016
-
1017
1006
 #ifdef CONFIG_BLK_DEV_INITRD
1018
1007
 	if (initrd_start && !initrd_below_start_ok &&
1019
1008
 	    page_to_pfn(virt_to_page((void *)initrd_start)) < min_low_pfn) {
..
..
@@ -1030,6 +1019,9 @@
1030
1019
 		late_time_init();
1031
1020
 	sched_clock_init();
1032
1021
 	calibrate_delay();
1022
+
1023
+	arch_cpu_finalize_init();
1024
+
1033
1025
 	pid_idr_init();
1034
1026
 	anon_vma_init();
1035
1027
 #ifdef CONFIG_X86
..
..
@@ -1055,9 +1047,6 @@
1055
1047
 	cgroup_init();
1056
1048
 	taskstats_init_early();
1057
1049
 	delayacct_init();
1058
-
1059
-	poking_init();
1060
-	check_bugs();
1061
1050
 
1062
1051
 	acpi_subsystem_init();
1063
1052
 	arch_post_acpi_subsys_init();