During boot, pSeries_request_regions() should only request I/O ports for
legacy ISA in the case that ISA exists on the system.  Add a check for
this.  This patch was suggested by Anton.

Signed-off-by: John Rose <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>

diff -puN arch/ppc64/kernel/pSeries_pci.c~02_ppc64_request_regions 
arch/ppc64/kernel/pSeries_pci.c
--- 2_6_linus_4/arch/ppc64/kernel/pSeries_pci.c~02_ppc64_request_regions        
2005-03-14 15:59:44.000000000 -0600
+++ 2_6_linus_4-johnrose/arch/ppc64/kernel/pSeries_pci.c        2005-03-14 
15:59:44.000000000 -0600
@@ -540,6 +540,9 @@ EXPORT_SYMBOL(pcibios_remove_root_bus);
 
 static void __init pSeries_request_regions(void)
 {
+       if (!isa_io_base)
+               return;
+
        request_region(0x20,0x20,"pic1");
        request_region(0xa0,0x20,"pic2");
        request_region(0x00,0x20,"dma1");
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to