kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/x86/kernel/Makefile
..
..
@@ -20,6 +20,8 @@
20
20
 CFLAGS_REMOVE_ftrace.o = -pg
21
21
 CFLAGS_REMOVE_early_printk.o = -pg
22
22
 CFLAGS_REMOVE_head64.o = -pg
23
+CFLAGS_REMOVE_sev-es.o = -pg
24
+CFLAGS_REMOVE_cc_platform.o = -pg
23
25
 endif
24
26
 
25
27
 KASAN_SANITIZE_head$(BITS).o				:= n
..
..
@@ -27,10 +29,15 @@
27
29
 KASAN_SANITIZE_dumpstack_$(BITS).o			:= n
28
30
 KASAN_SANITIZE_stacktrace.o				:= n
29
31
 KASAN_SANITIZE_paravirt.o				:= n
32
+KASAN_SANITIZE_sev-es.o					:= n
33
+KASAN_SANITIZE_cc_platform.o				:= n
30
34
 
31
-OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o	:= y
35
+# With some compiler versions the generated code results in boot hangs, caused
36
+# by several compilation units. To be safe, disable all instrumentation.
37
+KCSAN_SANITIZE := n
38
+
32
39
 OBJECT_FILES_NON_STANDARD_test_nx.o			:= y
33
-OBJECT_FILES_NON_STANDARD_paravirt_patch_$(BITS).o	:= y
40
+OBJECT_FILES_NON_STANDARD_paravirt_patch.o		:= y
34
41
 
35
42
 ifdef CONFIG_FRAME_POINTER
36
43
 OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o		:= y
..
..
@@ -42,7 +49,10 @@
42
49
 # non-deterministic coverage.
43
50
 KCOV_INSTRUMENT		:= n
44
51
 
45
-CFLAGS_irq.o := -I$(src)/../include/asm/trace
52
+CFLAGS_head$(BITS).o	+= -fno-stack-protector
53
+CFLAGS_cc_platform.o	+= -fno-stack-protector
54
+
55
+CFLAGS_irq.o := -I $(srctree)/$(src)/../include/asm/trace
46
56
 
47
57
 obj-y			:= process_$(BITS).o signal.o
48
58
 obj-$(CONFIG_COMPAT)	+= signal_compat.o
..
..
@@ -53,6 +63,8 @@
53
63
 obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o
54
64
 obj-$(CONFIG_IRQ_WORK)  += irq_work.o
55
65
 obj-y			+= probe_roms.o
66
+obj-$(CONFIG_X86_32)	+= sys_ia32.o
67
+obj-$(CONFIG_IA32_EMULATION)	+= sys_ia32.o
56
68
 obj-$(CONFIG_X86_64)	+= sys_x86_64.o
57
69
 obj-$(CONFIG_X86_ESPFIX64)	+= espfix_64.o
58
70
 obj-$(CONFIG_SYSFS)	+= ksysfs.o
..
..
@@ -63,6 +75,7 @@
63
75
 obj-y			+= pci-iommu_table.o
64
76
 obj-y			+= resource.o
65
77
 obj-y			+= irqflags.o
78
+obj-y			+= static_call.o
66
79
 
67
80
 obj-y				+= process.o
68
81
 obj-y				+= fpu/
..
..
@@ -89,18 +102,18 @@
89
102
 obj-y				+= apic/
90
103
 obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o
91
104
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
92
-obj-$(CONFIG_LIVEPATCH)	+= livepatch.o
93
105
 obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace_$(BITS).o
94
106
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
95
107
 obj-$(CONFIG_FTRACE_SYSCALLS)	+= ftrace.o
96
108
 obj-$(CONFIG_X86_TSC)		+= trace_clock.o
109
+obj-$(CONFIG_CRASH_CORE)	+= crash_core_$(BITS).o
97
110
 obj-$(CONFIG_KEXEC_CORE)	+= machine_kexec_$(BITS).o
98
111
 obj-$(CONFIG_KEXEC_CORE)	+= relocate_kernel_$(BITS).o crash.o
99
112
 obj-$(CONFIG_KEXEC_FILE)	+= kexec-bzimage64.o
100
113
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
101
114
 obj-y				+= kprobes/
102
115
 obj-$(CONFIG_MODULES)		+= module.o
103
-obj-$(CONFIG_DOUBLEFAULT)	+= doublefault.o
116
+obj-$(CONFIG_X86_32)		+= doublefault_32.o
104
117
 obj-$(CONFIG_KGDB)		+= kgdb.o
105
118
 obj-$(CONFIG_VM86)		+= vm86_32.o
106
119
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
..
..
@@ -112,7 +125,7 @@
112
125
 obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o
113
126
 
114
127
 obj-$(CONFIG_KVM_GUEST)		+= kvm.o kvmclock.o
115
-obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
128
+obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch.o
116
129
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o
117
130
 obj-$(CONFIG_PARAVIRT_CLOCK)	+= pvclock.o
118
131
 obj-$(CONFIG_X86_PMEM_LEGACY_DEVICE) += pmem.o
..
..
@@ -134,11 +147,15 @@
134
147
 obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o
135
148
 obj-$(CONFIG_TRACING)			+= tracepoint.o
136
149
 obj-$(CONFIG_SCHED_MC_PRIO)		+= itmt.o
137
-obj-$(CONFIG_X86_INTEL_UMIP)		+= umip.o
150
+obj-$(CONFIG_X86_UMIP)			+= umip.o
138
151
 
139
152
 obj-$(CONFIG_UNWINDER_ORC)		+= unwind_orc.o
140
153
 obj-$(CONFIG_UNWINDER_FRAME_POINTER)	+= unwind_frame.o
141
154
 obj-$(CONFIG_UNWINDER_GUESS)		+= unwind_guess.o
155
+
156
+obj-$(CONFIG_AMD_MEM_ENCRYPT)		+= sev-es.o
157
+
158
+obj-$(CONFIG_ARCH_HAS_CC_PLATFORM)	+= cc_platform.o
142
159
 
143
160
 ###
144
161
 # 64 bit specific files
..
..
@@ -146,8 +163,9 @@
146
163
 	obj-$(CONFIG_AUDIT)		+= audit_64.o
147
164
 
148
165
 	obj-$(CONFIG_GART_IOMMU)	+= amd_gart_64.o aperture_64.o
149
-	obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o
150
166
 
151
167
 	obj-$(CONFIG_MMCONF_FAM10H)	+= mmconf-fam10h_64.o
152
168
 	obj-y				+= vsmp_64.o
153
169
 endif
170
+
171
+obj-$(CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT)	+= ima_arch.o