hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/x86/kernel/Makefile
....@@ -20,6 +20,8 @@
2020 CFLAGS_REMOVE_ftrace.o = -pg
2121 CFLAGS_REMOVE_early_printk.o = -pg
2222 CFLAGS_REMOVE_head64.o = -pg
23
+CFLAGS_REMOVE_sev-es.o = -pg
24
+CFLAGS_REMOVE_cc_platform.o = -pg
2325 endif
2426
2527 KASAN_SANITIZE_head$(BITS).o := n
....@@ -27,10 +29,15 @@
2729 KASAN_SANITIZE_dumpstack_$(BITS).o := n
2830 KASAN_SANITIZE_stacktrace.o := n
2931 KASAN_SANITIZE_paravirt.o := n
32
+KASAN_SANITIZE_sev-es.o := n
33
+KASAN_SANITIZE_cc_platform.o := n
3034
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
+
3239 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
3441
3542 ifdef CONFIG_FRAME_POINTER
3643 OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o := y
....@@ -42,7 +49,10 @@
4249 # non-deterministic coverage.
4350 KCOV_INSTRUMENT := n
4451
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
4656
4757 obj-y := process_$(BITS).o signal.o
4858 obj-$(CONFIG_COMPAT) += signal_compat.o
....@@ -53,6 +63,8 @@
5363 obj-$(CONFIG_JUMP_LABEL) += jump_label.o
5464 obj-$(CONFIG_IRQ_WORK) += irq_work.o
5565 obj-y += probe_roms.o
66
+obj-$(CONFIG_X86_32) += sys_ia32.o
67
+obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o
5668 obj-$(CONFIG_X86_64) += sys_x86_64.o
5769 obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o
5870 obj-$(CONFIG_SYSFS) += ksysfs.o
....@@ -63,6 +75,7 @@
6375 obj-y += pci-iommu_table.o
6476 obj-y += resource.o
6577 obj-y += irqflags.o
78
+obj-y += static_call.o
6679
6780 obj-y += process.o
6881 obj-y += fpu/
....@@ -89,18 +102,18 @@
89102 obj-y += apic/
90103 obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
91104 obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
92
-obj-$(CONFIG_LIVEPATCH) += livepatch.o
93105 obj-$(CONFIG_FUNCTION_TRACER) += ftrace_$(BITS).o
94106 obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
95107 obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
96108 obj-$(CONFIG_X86_TSC) += trace_clock.o
109
+obj-$(CONFIG_CRASH_CORE) += crash_core_$(BITS).o
97110 obj-$(CONFIG_KEXEC_CORE) += machine_kexec_$(BITS).o
98111 obj-$(CONFIG_KEXEC_CORE) += relocate_kernel_$(BITS).o crash.o
99112 obj-$(CONFIG_KEXEC_FILE) += kexec-bzimage64.o
100113 obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o
101114 obj-y += kprobes/
102115 obj-$(CONFIG_MODULES) += module.o
103
-obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
116
+obj-$(CONFIG_X86_32) += doublefault_32.o
104117 obj-$(CONFIG_KGDB) += kgdb.o
105118 obj-$(CONFIG_VM86) += vm86_32.o
106119 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
....@@ -112,7 +125,7 @@
112125 obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o
113126
114127 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
116129 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o
117130 obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o
118131 obj-$(CONFIG_X86_PMEM_LEGACY_DEVICE) += pmem.o
....@@ -134,11 +147,15 @@
134147 obj-$(CONFIG_PERF_EVENTS) += perf_regs.o
135148 obj-$(CONFIG_TRACING) += tracepoint.o
136149 obj-$(CONFIG_SCHED_MC_PRIO) += itmt.o
137
-obj-$(CONFIG_X86_INTEL_UMIP) += umip.o
150
+obj-$(CONFIG_X86_UMIP) += umip.o
138151
139152 obj-$(CONFIG_UNWINDER_ORC) += unwind_orc.o
140153 obj-$(CONFIG_UNWINDER_FRAME_POINTER) += unwind_frame.o
141154 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
142159
143160 ###
144161 # 64 bit specific files
....@@ -146,8 +163,9 @@
146163 obj-$(CONFIG_AUDIT) += audit_64.o
147164
148165 obj-$(CONFIG_GART_IOMMU) += amd_gart_64.o aperture_64.o
149
- obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
150166
151167 obj-$(CONFIG_MMCONF_FAM10H) += mmconf-fam10h_64.o
152168 obj-y += vsmp_64.o
153169 endif
170
+
171
+obj-$(CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT) += ima_arch.o