hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/x86/kernel/cpu/Makefile
....@@ -13,9 +13,11 @@
1313 KCOV_INSTRUMENT_common.o := n
1414 KCOV_INSTRUMENT_perf_event.o := n
1515
16
+# As above, instrumenting secondary CPU boot code causes boot hangs.
17
+KCSAN_SANITIZE_common.o := n
18
+
1619 # Make sure load_percpu_segment has no stackprotector
17
-nostackp := $(call cc-option, -fno-stack-protector)
18
-CFLAGS_common.o := $(nostackp)
20
+CFLAGS_common.o := -fno-stack-protector
1921
2022 obj-y := cacheinfo.o scattered.o topology.o
2123 obj-y += common.o
....@@ -24,37 +26,42 @@
2426 obj-y += bugs.o
2527 obj-y += aperfmperf.o
2628 obj-y += cpuid-deps.o
29
+obj-y += umwait.o
2730
2831 obj-$(CONFIG_PROC_FS) += proc.o
2932 obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o
3033
31
-obj-$(CONFIG_CPU_SUP_INTEL) += intel.o intel_pconfig.o tsx.o
34
+obj-$(CONFIG_IA32_FEAT_CTL) += feat_ctl.o
35
+ifdef CONFIG_CPU_SUP_INTEL
36
+obj-y += intel.o intel_pconfig.o tsx.o
37
+obj-$(CONFIG_PM) += intel_epb.o
38
+endif
3239 obj-$(CONFIG_CPU_SUP_AMD) += amd.o
40
+obj-$(CONFIG_CPU_SUP_HYGON) += hygon.o
3341 obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o
3442 obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
3543 obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
3644 obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
45
+obj-$(CONFIG_CPU_SUP_ZHAOXIN) += zhaoxin.o
3746
38
-obj-$(CONFIG_INTEL_RDT) += intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_monitor.o
39
-obj-$(CONFIG_INTEL_RDT) += intel_rdt_ctrlmondata.o intel_rdt_pseudo_lock.o
40
-CFLAGS_intel_rdt_pseudo_lock.o = -I$(src)
41
-
42
-obj-$(CONFIG_X86_MCE) += mcheck/
47
+obj-$(CONFIG_X86_MCE) += mce/
4348 obj-$(CONFIG_MTRR) += mtrr/
4449 obj-$(CONFIG_MICROCODE) += microcode/
50
+obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/
4551
4652 obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
4753
4854 obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o
55
+obj-$(CONFIG_ACRN_GUEST) += acrn.o
4956
5057 ifdef CONFIG_X86_FEATURE_NAMES
5158 quiet_cmd_mkcapflags = MKCAP $@
52
- cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@
59
+ cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $@ $^
5360
5461 cpufeature = $(src)/../../include/asm/cpufeatures.h
62
+vmxfeature = $(src)/../../include/asm/vmxfeatures.h
5563
56
-targets += capflags.c
57
-$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE
64
+$(obj)/capflags.c: $(cpufeature) $(vmxfeature) $(src)/mkcapflags.sh FORCE
5865 $(call if_changed,mkcapflags)
5966 endif
60
-clean-files += capflags.c
67
+targets += capflags.c