[Xen-devel] [PATCH 3/4] xen: link platform-pci-unplug.o only if CONFIG_XEN_PVHVM

[Juergen Gross <jgross@xxxxxxxx>]

Instead of using one large #ifdef CONFIG_XEN_PVHVM in
arch/x86/xen/platform-pci-unplug.c add the object file depending on
CONFIG_XEN_PVHVM being set.

Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 arch/x86/xen/Makefile              | 2 +-
 arch/x86/xen/platform-pci-unplug.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index a964f307a266..dd2550d33b38 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -19,11 +19,11 @@ obj-y                               += mmu.o
 obj-y                          += time.o
 obj-y                          += grant-table.o
 obj-y                          += suspend.o
-obj-y                          += platform-pci-unplug.o
 
 obj-$(CONFIG_XEN_PVHVM)                += enlighten_hvm.o
 obj-$(CONFIG_XEN_PVHVM)                += mmu_hvm.o
 obj-$(CONFIG_XEN_PVHVM)                += suspend_hvm.o
+obj-$(CONFIG_XEN_PVHVM)                += platform-pci-unplug.o
 
 obj-$(CONFIG_XEN_PV)           += setup.o
 obj-$(CONFIG_XEN_PV)           += apic.o
diff --git a/arch/x86/xen/platform-pci-unplug.c 
b/arch/x86/xen/platform-pci-unplug.c
index 33a783c77d96..3957946a6cfe 100644
--- a/arch/x86/xen/platform-pci-unplug.c
+++ b/arch/x86/xen/platform-pci-unplug.c
@@ -30,7 +30,6 @@
 #define XEN_PLATFORM_ERR_PROTOCOL -2
 #define XEN_PLATFORM_ERR_BLACKLIST -3
 
-#ifdef CONFIG_XEN_PVHVM
 /* store the value of xen_emul_unplug after the unplug is done */
 static int xen_platform_pci_unplug;
 static int xen_emul_unplug;
@@ -214,4 +213,3 @@ static int __init parse_xen_emul_unplug(char *arg)
        return 0;
 }
 early_param("xen_emul_unplug", parse_xen_emul_unplug);
-#endif
-- 
2.13.7


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel