[PATCH 4/5] x86/xen: put setup.c, pmu.c and apic.c under CONFIG_XEN_PV

From: Vitaly Kuznetsov
Date: Fri Feb 24 2017 - 11:15:35 EST


xen_pmu_init/finish() functions are used in suspend.c and
enlighten.c, add stubs for now.

Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
---
arch/x86/xen/Kconfig | 2 +-
arch/x86/xen/Makefile | 5 +++--
arch/x86/xen/pmu.h | 5 +++++
3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 9ebfd77..aa8256b 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -6,7 +6,6 @@ config XEN
bool "Xen guest support"
depends on PARAVIRT
select PARAVIRT_CLOCK
- select XEN_HAVE_VPMU
depends on X86_64 || (X86_32 && X86_PAE)
depends on X86_LOCAL_APIC && X86_TSC
help
@@ -18,6 +17,7 @@ config XEN_PV
bool "Xen PV guest support"
default y
depends on XEN
+ select XEN_HAVE_VPMU
help
Support running as a Xen PV guest.

diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 3bf840e..10264ed 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -13,9 +13,10 @@ CFLAGS_mmu_pv.o := $(nostackp)
obj-y := enlighten.o multicalls.o \
irq.o time.o xen-asm.o xen-asm_$(BITS).o \
grant-table.o suspend.o platform-pci-unplug.o \
- apic.o pmu.o mmu.o
+ mmu.o

-obj-$(CONFIG_XEN_PV) += enlighten_pv.o setup.o mmu_pv.o p2m.o
+obj-$(CONFIG_XEN_PV) += enlighten_pv.o setup.o mmu_pv.o p2m.o \
+ apic.o pmu.o
obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o mmu_hvm.o
obj-$(CONFIG_XEN_PVH) += enlighten_pvh.o

diff --git a/arch/x86/xen/pmu.h b/arch/x86/xen/pmu.h
index af5f0ad..4be5355 100644
--- a/arch/x86/xen/pmu.h
+++ b/arch/x86/xen/pmu.h
@@ -4,8 +4,13 @@
#include <xen/interface/xenpmu.h>

irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id);
+#ifdef CONFIG_XEN_HAVE_VPMU
void xen_pmu_init(int cpu);
void xen_pmu_finish(int cpu);
+#else
+static inline void xen_pmu_init(int cpu) {}
+static inline void xen_pmu_finish(int cpu) {}
+#endif
bool is_xen_pmu(int cpu);
bool pmu_msr_read(unsigned int msr, uint64_t *val, int *err);
bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err);
--
2.9.3