]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xen/pci: Fix build on non-x86
authorBen Hutchings <ben@decadent.org.uk>
Tue, 31 Dec 2013 19:46:27 +0000 (20:46 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Feb 2014 19:33:51 +0000 (11:33 -0800)
commit b7ef4a6dd35d1b47db72fbd1a31c8fd0da7a74f3 upstream.

We can't include <asm/pci_x86.h> if this isn't x86, and we only need
it if CONFIG_PCI_MMCONFIG is enabled.

Fixes: 8deb3eb1461e ('xen/mcfg: Call PHYSDEVOP_pci_mmcfg_reserved for MCFG areas.')
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/xen/pci.c

index 188825122aae8a037bccc8255dbd43211ca6a941..dd9c249ea3118f1e16d05289ff4af766c49d886f 100644 (file)
@@ -26,7 +26,9 @@
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>
 #include "../pci/pci.h"
+#ifdef CONFIG_PCI_MMCONFIG
 #include <asm/pci_x86.h>
+#endif
 
 static bool __read_mostly pci_seg_supported = true;