powerpc: Initialise pci_io_base as early as possible

[cascardo/linux.git] / arch / powerpc / kernel / pci_64.c

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 60bb187..a5ae49a 100644 (file)
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -38,7 +38,7 @@
  * ISA drivers use hard coded offsets.  If no ISA bus exists nothing
  * is mapped on the first 64K of IO space
  */
-unsigned long pci_io_base = ISA_IO_BASE;
+unsigned long pci_io_base;
 EXPORT_SYMBOL(pci_io_base);
 
 static int __init pcibios_init(void)
@@ -159,7 +159,7 @@ static int pcibios_map_phb_io_space(struct pci_controller *hose)
 
        /* Establish the mapping */
        if (__ioremap_at(phys_page, area->addr, size_page,
-                        _PAGE_NO_CACHE | _PAGE_GUARDED) == NULL)
+                        pgprot_val(pgprot_noncached(__pgprot(0)))) == NULL)
                return -ENOMEM;
 
        /* Fixup hose IO resource */