| .. | .. |
|---|
| 13 | 13 | KCOV_INSTRUMENT_common.o := n |
|---|
| 14 | 14 | KCOV_INSTRUMENT_perf_event.o := n |
|---|
| 15 | 15 | |
|---|
| 16 | +# As above, instrumenting secondary CPU boot code causes boot hangs. |
|---|
| 17 | +KCSAN_SANITIZE_common.o := n |
|---|
| 18 | + |
|---|
| 16 | 19 | # 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 |
|---|
| 19 | 21 | |
|---|
| 20 | 22 | obj-y := cacheinfo.o scattered.o topology.o |
|---|
| 21 | 23 | obj-y += common.o |
|---|
| .. | .. |
|---|
| 24 | 26 | obj-y += bugs.o |
|---|
| 25 | 27 | obj-y += aperfmperf.o |
|---|
| 26 | 28 | obj-y += cpuid-deps.o |
|---|
| 29 | +obj-y += umwait.o |
|---|
| 27 | 30 | |
|---|
| 28 | 31 | obj-$(CONFIG_PROC_FS) += proc.o |
|---|
| 29 | 32 | obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o |
|---|
| 30 | 33 | |
|---|
| 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 |
|---|
| 32 | 39 | obj-$(CONFIG_CPU_SUP_AMD) += amd.o |
|---|
| 40 | +obj-$(CONFIG_CPU_SUP_HYGON) += hygon.o |
|---|
| 33 | 41 | obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o |
|---|
| 34 | 42 | obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o |
|---|
| 35 | 43 | obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o |
|---|
| 36 | 44 | obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o |
|---|
| 45 | +obj-$(CONFIG_CPU_SUP_ZHAOXIN) += zhaoxin.o |
|---|
| 37 | 46 | |
|---|
| 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/ |
|---|
| 43 | 48 | obj-$(CONFIG_MTRR) += mtrr/ |
|---|
| 44 | 49 | obj-$(CONFIG_MICROCODE) += microcode/ |
|---|
| 50 | +obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/ |
|---|
| 45 | 51 | |
|---|
| 46 | 52 | obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o |
|---|
| 47 | 53 | |
|---|
| 48 | 54 | obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o |
|---|
| 55 | +obj-$(CONFIG_ACRN_GUEST) += acrn.o |
|---|
| 49 | 56 | |
|---|
| 50 | 57 | ifdef CONFIG_X86_FEATURE_NAMES |
|---|
| 51 | 58 | quiet_cmd_mkcapflags = MKCAP $@ |
|---|
| 52 | | - cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@ |
|---|
| 59 | + cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $@ $^ |
|---|
| 53 | 60 | |
|---|
| 54 | 61 | cpufeature = $(src)/../../include/asm/cpufeatures.h |
|---|
| 62 | +vmxfeature = $(src)/../../include/asm/vmxfeatures.h |
|---|
| 55 | 63 | |
|---|
| 56 | | -targets += capflags.c |
|---|
| 57 | | -$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE |
|---|
| 64 | +$(obj)/capflags.c: $(cpufeature) $(vmxfeature) $(src)/mkcapflags.sh FORCE |
|---|
| 58 | 65 | $(call if_changed,mkcapflags) |
|---|
| 59 | 66 | endif |
|---|
| 60 | | -clean-files += capflags.c |
|---|
| 67 | +targets += capflags.c |
|---|