[OpenBIOS] [PATCH v3 1/2] ppc: Adjust isa_io_base for ppc64

[Andreas Färber]

To avoid cast warnings, use a 64-bit ISA I/O base on ppc64.

v3:
* Adjust unix target, pointed out by Blue.
  Unify ppc and sparc64, using unsigned long instead of uintptr_t.
  It is initialized from pci_arch_t, which uses unsigned long.
* Update other ppc targets, pointed out by Blue.

v2:
Initial.

Cc: Blue Swirl <blauwirbel at gmail.com>
Cc: Alexander Graf <agraf at suse.de>
Signed-off-by: Andreas Färber <andreas.faerber at web.de>
---
 arch/ppc/briq/init.c   |    2 +-
 arch/ppc/mol/init.c    |    2 +-
 arch/ppc/pearpc/init.c |    2 +-
 arch/ppc/qemu/init.c   |    2 +-
 arch/unix/unix.c       |    4 +---
 include/arch/ppc/io.h  |    2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/arch/ppc/briq/init.c b/arch/ppc/briq/init.c
index 0b2b3b9..b32e97a 100644
--- a/arch/ppc/briq/init.c
+++ b/arch/ppc/briq/init.c
@@ -53,7 +53,7 @@ unexpected_excep( int vector )
 		;
 }
 
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )
diff --git a/arch/ppc/mol/init.c b/arch/ppc/mol/init.c
index 3d24352..15333b4 100644
--- a/arch/ppc/mol/init.c
+++ b/arch/ppc/mol/init.c
@@ -49,7 +49,7 @@ unexpected_excep( int vector )
 		;
 }
 
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )
diff --git a/arch/ppc/pearpc/init.c b/arch/ppc/pearpc/init.c
index b2c11c9..ca6da0a 100644
--- a/arch/ppc/pearpc/init.c
+++ b/arch/ppc/pearpc/init.c
@@ -56,7 +56,7 @@ unexpected_excep( int vector )
 		;
 }
 
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )
diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c
index ba215bc..0b781d9 100644
--- a/arch/ppc/qemu/init.c
+++ b/arch/ppc/qemu/init.c
@@ -152,7 +152,7 @@ static const pci_arch_t known_arch[] = {
         .irqs = { 21, 22, 23, 24 }
     },
 };
-uint32_t isa_io_base;
+unsigned long isa_io_base;
 
 void
 entry( void )
diff --git a/arch/unix/unix.c b/arch/unix/unix.c
index f1c18df..a8b9f78 100644
--- a/arch/unix/unix.c
+++ b/arch/unix/unix.c
@@ -63,9 +63,7 @@ static int diskemu;
 static int segfault = 0;
 static int verbose = 0;
 
-#ifdef CONFIG_PPC
-uint32_t isa_io_base;
-#elif defined(CONFIG_SPARC64)
+#if defined(CONFIG_PPC) || defined(CONFIG_SPARC64)
 unsigned long isa_io_base;
 #endif
 
diff --git a/include/arch/ppc/io.h b/include/arch/ppc/io.h
index e5180f2..267f167 100644
--- a/include/arch/ppc/io.h
+++ b/include/arch/ppc/io.h
@@ -14,7 +14,7 @@ extern unsigned long virt_offset;
 
 #ifndef BOOTSTRAP
 
-extern uint32_t isa_io_base;
+extern unsigned long isa_io_base;
 
 /*
  * The insw/outsw/insl/outsl macros don't do byte-swapping.
-- 
1.7.3