1 files changed, 21 insertions, 8 deletions
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index 6646c952c5e3..ce569b6bf4d8 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -53,41 +53,51 @@ kvm-e500mc-objs := \
        e500_emulate.o
 kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs)
-kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \
+kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) := \
-        $(KVM)/coalesced_mmio.o \
+        book3s_64_vio_hv.o
+kvm-pr-y := \
        fpu.o \
        book3s_paired_singles.o \
        book3s_pr.o \
        book3s_pr_papr.o \
-        book3s_64_vio_hv.o \
        book3s_emulate.o \
        book3s_interrupts.o \
        book3s_mmu_hpte.o \
        book3s_64_mmu_host.o \
        book3s_64_mmu.o \
        book3s_32_mmu.o
-kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \
+ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
+kvm-book3s_64-module-objs := \
+        $(KVM)/coalesced_mmio.o
+kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \
        book3s_rmhandlers.o
+endif
-kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \
+kvm-hv-y += \
        book3s_hv.o \
        book3s_hv_interrupts.o \
        book3s_64_mmu_hv.o
 kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \
        book3s_hv_rm_xics.o
-kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \
+ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
+kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \
        book3s_hv_rmhandlers.o \
        book3s_hv_rm_mmu.o \
-        book3s_64_vio_hv.o \
        book3s_hv_ras.o \
        book3s_hv_builtin.o \
        book3s_hv_cma.o \
        $(kvm-book3s_64-builtin-xics-objs-y)
+endif
 kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \
        book3s_xics.o
-kvm-book3s_64-module-objs := \
+kvm-book3s_64-module-objs += \
        $(KVM)/kvm_main.o \
        $(KVM)/eventfd.o \
        powerpc.o \
@@ -123,4 +133,7 @@ obj-$(CONFIG_KVM_E500MC) += kvm.o
 obj-$(CONFIG_KVM_BOOK3S_64) += kvm.o
 obj-$(CONFIG_KVM_BOOK3S_32) += kvm.o
+obj-$(CONFIG_KVM_BOOK3S_64_PR) += kvm-pr.o
+obj-$(CONFIG_KVM_BOOK3S_64_HV) += kvm-hv.o
 obj-y += $(kvm-book3s_64-builtin-objs-y)

diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index 6646c952c5e3..ce569b6bf4d8 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile
@@ -53,41 +53,51 @@ kvm-e500mc-objs := \
53	e500_emulate.o	53	e500_emulate.o
54	kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs)	54	kvm-objs-$(CONFIG_KVM_E500MC) := $(kvm-e500mc-objs)
55		55
56	kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \	56	kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) := \
57	$(KVM)/coalesced_mmio.o \	57	book3s_64_vio_hv.o
		58
		59	kvm-pr-y := \
58	fpu.o \	60	fpu.o \
59	book3s_paired_singles.o \	61	book3s_paired_singles.o \
60	book3s_pr.o \	62	book3s_pr.o \
61	book3s_pr_papr.o \	63	book3s_pr_papr.o \
62	book3s_64_vio_hv.o \
63	book3s_emulate.o \	64	book3s_emulate.o \
64	book3s_interrupts.o \	65	book3s_interrupts.o \
65	book3s_mmu_hpte.o \	66	book3s_mmu_hpte.o \
66	book3s_64_mmu_host.o \	67	book3s_64_mmu_host.o \
67	book3s_64_mmu.o \	68	book3s_64_mmu.o \
68	book3s_32_mmu.o	69	book3s_32_mmu.o
69	kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_PR) := \	70
		71	ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
		72	kvm-book3s_64-module-objs := \
		73	$(KVM)/coalesced_mmio.o
		74
		75	kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \
70	book3s_rmhandlers.o	76	book3s_rmhandlers.o
		77	endif
71		78
72	kvm-book3s_64-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \	79	kvm-hv-y += \
73	book3s_hv.o \	80	book3s_hv.o \
74	book3s_hv_interrupts.o \	81	book3s_hv_interrupts.o \
75	book3s_64_mmu_hv.o	82	book3s_64_mmu_hv.o
		83
76	kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \	84	kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \
77	book3s_hv_rm_xics.o	85	book3s_hv_rm_xics.o
78	kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \	86
		87	ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
		88	kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \
79	book3s_hv_rmhandlers.o \	89	book3s_hv_rmhandlers.o \
80	book3s_hv_rm_mmu.o \	90	book3s_hv_rm_mmu.o \
81	book3s_64_vio_hv.o \
82	book3s_hv_ras.o \	91	book3s_hv_ras.o \
83	book3s_hv_builtin.o \	92	book3s_hv_builtin.o \
84	book3s_hv_cma.o \	93	book3s_hv_cma.o \
85	$(kvm-book3s_64-builtin-xics-objs-y)	94	$(kvm-book3s_64-builtin-xics-objs-y)
		95	endif
86		96
87	kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \	97	kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \
88	book3s_xics.o	98	book3s_xics.o
89		99
90	kvm-book3s_64-module-objs := \	100	kvm-book3s_64-module-objs += \
91	$(KVM)/kvm_main.o \	101	$(KVM)/kvm_main.o \
92	$(KVM)/eventfd.o \	102	$(KVM)/eventfd.o \
93	powerpc.o \	103	powerpc.o \
@@ -123,4 +133,7 @@ obj-$(CONFIG_KVM_E500MC) += kvm.o
123	obj-$(CONFIG_KVM_BOOK3S_64) += kvm.o	133	obj-$(CONFIG_KVM_BOOK3S_64) += kvm.o
124	obj-$(CONFIG_KVM_BOOK3S_32) += kvm.o	134	obj-$(CONFIG_KVM_BOOK3S_32) += kvm.o
125		135
		136	obj-$(CONFIG_KVM_BOOK3S_64_PR) += kvm-pr.o
		137	obj-$(CONFIG_KVM_BOOK3S_64_HV) += kvm-hv.o
		138
126	obj-y += $(kvm-book3s_64-builtin-objs-y)	139	obj-y += $(kvm-book3s_64-builtin-objs-y)