[PATCH] ppc64: Fix iSeries build (ouch !)

The move of iomap out of eeh inadvertently broke iSeries ...

Fixed like this.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c
index d3715a1538c6af065a90950cd3c48467a077c3b0..7aa56dfe2e51d92b3e6612a2fa3ddf18977f7b32 100644 (file)
--- a/arch/ppc64/kernel/iSeries_pci.c
+++ b/arch/ppc64/kernel/iSeries_pci.c
@@ -55,6 +55,7 @@ extern int panic_timeout;
 extern unsigned long iSeries_Base_Io_Memory;    
 
 extern struct iommu_table *tceTables[256];
+extern unsigned long io_page_mask;
 
 extern void iSeries_MmIoTest(void);
 
@@ -196,6 +197,7 @@ void iSeries_pcibios_init(void)
        PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_init Entry.\n"); 
        iSeries_IoMmTable_Initialize();
        find_and_init_phbs();
+       io_page_mask = -1;
        /* pci_assign_all_busses = 0;           SFRXXX*/
        PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_init Exit.\n"); 
 }

diff --git a/include/asm-ppc64/eeh.h b/include/asm-ppc64/eeh.h
index 85bc6850f08155c480f823c8d03e4d2ef8574ec1..2f78baa0a15ea74f4b390f9159f9029d1c2ed27f 100644 (file)
--- a/include/asm-ppc64/eeh.h
+++ b/include/asm-ppc64/eeh.h
@@ -256,10 +256,6 @@ static inline void eeh_memcpy_toio(volatile void __iomem *dest, const void *src,
 
 #undef EEH_CHECK_ALIGN
 
-#define MAX_ISA_PORT 0x10000
-extern unsigned long io_page_mask;
-#define _IO_IS_VALID(port) ((port) >= MAX_ISA_PORT || (1 << (port>>PAGE_SHIFT)) & io_page_mask)
-
 static inline u8 eeh_inb(unsigned long port) {
        u8 val;
        if (!_IO_IS_VALID(port))

diff --git a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h
index 46d47573d1a44fa384255a85049d371900cd876f..f2db3d86035b1629f9ff29a6f8b3c72ee0b0a522 100644 (file)
--- a/include/asm-ppc64/io.h
+++ b/include/asm-ppc64/io.h
@@ -33,6 +33,12 @@
 
 extern unsigned long isa_io_base;
 extern unsigned long pci_io_base;
+extern unsigned long io_page_mask;
+
+#define MAX_ISA_PORT 0x10000
+
+#define _IO_IS_VALID(port) ((port) >= MAX_ISA_PORT || (1 << (port>>PAGE_SHIFT)) \
+                           & io_page_mask)
 
 #ifdef CONFIG_PPC_ISERIES
 /* __raw_* accessors aren't supported on iSeries */