Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 066212e0 authored by Paul Mackerras's avatar Paul Mackerras Committed by Alexander Graf
Browse files

kvm: powerpc: book3s: move book3s_64_vio_hv.c into the main kernel binary 



Since the code in book3s_64_vio_hv.c is called from real mode with HV
KVM, and therefore has to be built into the main kernel binary, this
makes it always built-in rather than part of the KVM module.  It gets
called from the KVM module by PR KVM, so this adds an EXPORT_SYMBOL_GPL().

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 178db620

arch/powerpc/kvm/Makefile

+8 −4
Original line number Original line Diff line number Diff line
@@ -53,32 +53,36 @@ kvm-e500mc-objs := \ 
	e500_emulate.o

	e500_emulate.o

kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs)

kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs)





kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) := \

	book3s_64_vio_hv.o



kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \

kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \

	$(KVM)/coalesced_mmio.o \

	$(KVM)/coalesced_mmio.o \

	fpu.o \

	fpu.o \

	book3s_paired_singles.o \

	book3s_paired_singles.o \

	book3s_pr.o \

	book3s_pr.o \

	book3s_pr_papr.o \

	book3s_pr_papr.o \

	book3s_64_vio_hv.o \

	book3s_emulate.o \

	book3s_emulate.o \

	book3s_interrupts.o \

	book3s_interrupts.o \

	book3s_mmu_hpte.o \

	book3s_mmu_hpte.o \

	book3s_64_mmu_host.o \

	book3s_64_mmu_host.o \

	book3s_64_mmu.o \

	book3s_64_mmu.o \

	book3s_32_mmu.o

	book3s_32_mmu.o

kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \



kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_PR) += \

	book3s_rmhandlers.o

	book3s_rmhandlers.o





kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \

kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \

	book3s_hv.o \

	book3s_hv.o \

	book3s_hv_interrupts.o \

	book3s_hv_interrupts.o \

	book3s_64_mmu_hv.o

	book3s_64_mmu_hv.o



kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \

kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \

	book3s_hv_rm_xics.o

	book3s_hv_rm_xics.o

kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \



kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HV) += \

	book3s_hv_rmhandlers.o \

	book3s_hv_rmhandlers.o \

	book3s_hv_rm_mmu.o \

	book3s_hv_rm_mmu.o \

	book3s_64_vio_hv.o \

	book3s_hv_ras.o \

	book3s_hv_ras.o \

	book3s_hv_builtin.o \

	book3s_hv_builtin.o \

	book3s_hv_cma.o \

	book3s_hv_cma.o \

arch/powerpc/kvm/book3s_64_vio_hv.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -74,3 +74,4 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, 
	/* Didn't find the liobn, punt it to userspace */

	/* Didn't find the liobn, punt it to userspace */

	return H_TOO_HARD;

	return H_TOO_HARD;

}

}

EXPORT_SYMBOL_GPL(kvmppc_h_put_tce);