[PATCH] x86_64: Fix zero mcfg entry workaround on x86-64

I broke this earlier when moving the patch from i386 to x86-64.
Need to return the virtual address here, not the physical address.
This fixes some boot time crashes on x86-64.

Cc: gregkh@suse.de
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index 00d4ddbf980ccdddf23153f3e2758ac72ef90f9a..b4a3fe4ec249d3b1f839163f55cd4f32fbeacf1b 100644 (file)
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -46,7 +46,7 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus)
        if (pci_mmcfg_config_num == 1 &&
                cfg->pci_segment_group_number == 0 &&
                (cfg->start_bus_number | cfg->end_bus_number) == 0)
-               return cfg->base_address;
+               return pci_mmcfg_virt[0].virt;
 
        /* Fall back to type 0 */
        return 0;