From 62c9fbd36542d0b0d6ef4fb53f79e3aa638a20c7 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 13 Sep 2012 17:28:06 +0000 Subject: [PATCH] xen: do not compile manage, balloon, pci, acpi, pcpu and cpu_hotplug on ARM Changes in v4: - compile pcpu only on x86; - use "+=" instead of ":=" for dom0- targets. Changes in v2: - make pci.o depend on CONFIG_PCI and acpi.o depend on CONFIG_ACPI. Signed-off-by: Stefano Stabellini Acked-by: Konrad Rzeszutek Wilk (cherry picked from commit 13febc84849d4f14a088fe3b09111bdb1951ab42) Conflicts: drivers/xen/Makefile --- drivers/xen/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index e2bba5af7b0a..e49b448a0e1b 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,12 +1,19 @@ -obj-y += grant-table.o features.o events.o manage.o balloon.o +ifneq ($(CONFIG_ARM),y) +obj-y += manage.o balloon.o +obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o +endif +obj-y += grant-table.o features.o events.o obj-y += xenbus/ obj-y += tmem.o nostackp := $(call cc-option, -fno-stack-protector) CFLAGS_features.o := $(nostackp) +obj-$(CONFIG_XEN_DOM0) += $(dom0-y) +dom0-$(CONFIG_PCI) += pci.o +dom0-$(CONFIG_ACPI) += acpi.o +dom0-$(CONFIG_X86) += pcpu.o obj-$(CONFIG_BLOCK) += biomerge.o -obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o @@ -17,7 +24,6 @@ obj-$(CONFIG_XENFS) += xenfs/ obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o obj-$(CONFIG_XEN_PVHVM) += platform-pci.o obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o -obj-$(CONFIG_XEN_DOM0) += pci.o obj-$(CONFIG_XEN_MCE_LOG) += mcelog.o obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o -- 2.50.1