diff options
| author |   Sean Christopherson <sean.j.christopherson@intel.com> | 2019-12-20 20:44:56 -0800 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2020-01-13 17:30:04 +0100 |
| commit | a5543d3456dd131f072c5c278f1708aeaeaff0da (patch) | |
| tree | 55fd6b14eb3649bb9d6eb9e09cf51760ae930ab4 /tools/testing/selftests/kvm/Makefile | |
| parent | x86/msr-index: Clean up bit defines for IA32_FEATURE_CONTROL MSR (diff) | |
| download | linux-dev-a5543d3456dd131f072c5c278f1708aeaeaff0da.tar.xz linux-dev-a5543d3456dd131f072c5c278f1708aeaeaff0da.zip | |
selftests, kvm: Replace manual MSR defs with common msr-index.h
The kernel's version of msr-index.h was pulled wholesale into tools by
commit
444e2ff34df8 ("tools arch x86: Grab a copy of the file containing the MSR numbers"),
Use the common msr-index.h instead of manually redefining everything in
a KVM-only header.
Note, a few MSR-related definitions remain in processor.h because they
are not covered by msr-index.h, including the awesomely named
APIC_BASE_MSR, which refers to starting index of the x2APIC MSRs, not
the actual MSR_IA32_APICBASE, which *is* defined by msr-index.h.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20191221044513.21680-3-sean.j.christopherson@intel.com
Diffstat (limited to 'tools/testing/selftests/kvm/Makefile')
| -rw-r--r-- | tools/testing/selftests/kvm/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile index 3138a916574a..608fa835c764 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -45,9 +45,11 @@ LIBKVM += $(LIBKVM_$(UNAME_M)) INSTALL_HDR_PATH = $(top_srcdir)/usr LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/ LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include +LINUX_TOOL_ARCH_INCLUDE = $(top_srcdir)/tools/arch/x86/include CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \ -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \ - -I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I.. + -I$(LINUX_TOOL_ARCH_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude \ + -I$(<D) -Iinclude/$(UNAME_M) -I.. no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \ $(CC) -Werror -no-pie -x c - -o "$$TMP", -no-pie) |