xen/pci: don't use PCI BIOS service for configuration space accesses

[pandora-kernel.git] / arch / x86 / xen / enlighten.c

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 1f92865..e7c920b 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -62,6 +62,7 @@
 #include <asm/reboot.h>
 #include <asm/stackprotector.h>
 #include <asm/hypervisor.h>
 #include <asm/reboot.h>
 #include <asm/stackprotector.h>
 #include <asm/hypervisor.h>

+#include <asm/pci_x86.h>

 
 #include "xen-ops.h"
 #include "mmu.h"
 
 #include "xen-ops.h"
 #include "mmu.h"


@@ -1278,8 +1279,10 @@ asmlinkage void __init xen_start_kernel(void)
                /* Make sure ACS will be enabled */
                pci_request_acs();
        }
                /* Make sure ACS will be enabled */
                pci_request_acs();
        }

-               
-
+#ifdef CONFIG_PCI
+       /* PCI BIOS service won't work from a PV guest. */
+       pci_probe &= ~PCI_PROBE_BIOS;
+#endif

        xen_raw_console_write("about to get started...\n");
 
        xen_setup_runstate_info(0);
        xen_raw_console_write("about to get started...\n");
 
        xen_setup_runstate_info(0);