summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Burda <quent.burda@gmail.com>2022-10-05 16:49:55 +0200
committerLouis Burda <quent.burda@gmail.com>2022-10-05 16:49:55 +0200
commit85673dffca4ed4e0fbe82b03481e8178a8ea20b9 (patch)
tree82ab201c573d2c8e7344402ed32d09da366405ef
parentc901e09d8c3e2d75c4236b0e6cf52db75f9afafe (diff)
downloadcachepc-linux-85673dffca4ed4e0fbe82b03481e8178a8ea20b9.tar.gz
cachepc-linux-85673dffca4ed4e0fbe82b03481e8178a8ea20b9.zip
Move sevstep/kvm into sevstep/sevstep
-rw-r--r--arch/x86/kvm/Makefile6
-rw-r--r--arch/x86/kvm/x86.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index ddfd48fbd8ca..3c5f65040878 100644
--- a/arch/x86/kvm/Makefile
+++ b/arch/x86/kvm/Makefile
@@ -12,8 +12,8 @@ include $(srctree)/virt/kvm/Makefile.kvm
kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \
i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \
hyperv.o debugfs.o mmu/mmu.o mmu/page_track.o mmu/spte.o \
- svm/cachepc/cachepc.o svm/cachepc/util.o svm/cachepc/kvm.o \
- sevstep/sevstep.o sevstep/uspt.o sevstep/kvm.o
+ svm/cachepc/cachepc.o svm/cachepc/kvm.o \
+ sevstep/sevstep.o sevstep/uspt.o
ifdef CONFIG_HYPERV
kvm-y += kvm_onhyperv.o
@@ -27,7 +27,7 @@ kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \
kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o
kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o svm/sev.o \
- svm/cachepc/cachepc.o svm/cachepc/util.o
+ svm/cachepc/cachepc.o
ifdef CONFIG_HYPERV
kvm-amd-y += svm/svm_onhyperv.o
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 1809b79cb6cd..082dc8553566 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -82,7 +82,7 @@
#include <asm/sgx.h>
#include <clocksource/hyperv_timer.h>
-#include "sevstep/kvm.h"
+#include "sevstep/sevstep.h"
#define CREATE_TRACE_POINTS
#include "trace.h"