1 files changed, 30 insertions, 31 deletions

diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 0877a8834110..b72120751bbe 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -63,6 +63,7 @@
 #include "main_store.h"
 #include "call_sm.h"
 #include "call_hpt.h"
+#include "pci.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -74,11 +75,6 @@
 static unsigned long build_iSeries_Memory_Map(void);
 static void iseries_shared_idle(void);
 static void iseries_dedicated_idle(void);
-#ifdef CONFIG_PCI
-extern void iSeries_pci_final_fixup(void);
-#else
-static void iSeries_pci_final_fixup(void) { }
-#endif
 
 
 struct MemoryBlock {
@@ -112,13 +108,13 @@ static unsigned long iSeries_process_Condor_mainstore_vpd(
          * correctly.
          */
         mb_array[0].logicalStart = 0;
-        mb_array[0].logicalEnd = 0x100000000;
+        mb_array[0].logicalEnd = 0x100000000UL;
         mb_array[0].absStart = 0;
-        mb_array[0].absEnd = 0x100000000;
+        mb_array[0].absEnd = 0x100000000UL;
 
         if (holeSize) {
                 numMemoryBlocks = 2;
-                holeStart = holeStart & 0x000fffffffffffff;
+                holeStart = holeStart & 0x000fffffffffffffUL;
                 holeStart = addr_to_chunk(holeStart);
                 holeFirstChunk = holeStart;
                 holeSize = addr_to_chunk(holeSize);
@@ -128,9 +124,9 @@ static unsigned long iSeries_process_Condor_mainstore_vpd(
                 mb_array[0].logicalEnd = holeFirstChunk;
                 mb_array[0].absEnd = holeFirstChunk;
                 mb_array[1].logicalStart = holeFirstChunk;
-                mb_array[1].logicalEnd = 0x100000000 - holeSizeChunks;
+                mb_array[1].logicalEnd = 0x100000000UL - holeSizeChunks;
                 mb_array[1].absStart = holeFirstChunk + holeSizeChunks;
-                mb_array[1].absEnd = 0x100000000;
+                mb_array[1].absEnd = 0x100000000UL;
         }
         return numMemoryBlocks;
 }
@@ -234,9 +230,9 @@ static unsigned long iSeries_process_Regatta_mainstore_vpd(
                                 mb_array[i].logicalEnd,
                                 mb_array[i].absStart, mb_array[i].absEnd);
                 mb_array[i].absStart = addr_to_chunk(mb_array[i].absStart &
-                                0x000fffffffffffff);
+                                0x000fffffffffffffUL);
                 mb_array[i].absEnd = addr_to_chunk(mb_array[i].absEnd &
-                                0x000fffffffffffff);
+                                0x000fffffffffffffUL);
                 mb_array[i].logicalStart =
                         addr_to_chunk(mb_array[i].logicalStart);
                 mb_array[i].logicalEnd = addr_to_chunk(mb_array[i].logicalEnd);
@@ -320,7 +316,7 @@ struct mschunks_map mschunks_map = {
 };
 EXPORT_SYMBOL(mschunks_map);
 
-void mschunks_alloc(unsigned long num_chunks)
+static void mschunks_alloc(unsigned long num_chunks)
 {
         klimit = _ALIGN(klimit, sizeof(u32));
         mschunks_map.mapping = (u32 *)klimit;
@@ -499,6 +495,8 @@ static void __init iSeries_setup_arch(void)
                         itVpdAreas.xSlicMaxLogicalProcs);
         printk("Max physical processors = %d\n",
                         itVpdAreas.xSlicMaxPhysicalProcs);
+
+        iSeries_pcibios_init();
 }
 
 static void iSeries_show_cpuinfo(struct seq_file *m)
@@ -641,24 +639,25 @@ static int __init iseries_probe(void)
 }
 
 define_machine(iseries) {
-        .name           = "iSeries",
-        .setup_arch     = iSeries_setup_arch,
-        .show_cpuinfo   = iSeries_show_cpuinfo,
-        .init_IRQ       = iSeries_init_IRQ,
-        .get_irq        = iSeries_get_irq,
-        .init_early     = iSeries_init_early,
-        .pcibios_fixup  = iSeries_pci_final_fixup,
-        .restart        = mf_reboot,
-        .power_off      = mf_power_off,
-        .halt           = mf_power_off,
-        .get_boot_time  = iSeries_get_boot_time,
-        .set_rtc_time   = iSeries_set_rtc_time,
-        .get_rtc_time   = iSeries_get_rtc_time,
-        .calibrate_decr = generic_calibrate_decr,
-        .progress       = iSeries_progress,
-        .probe          = iseries_probe,
-        .ioremap        = iseries_ioremap,
-        .iounmap        = iseries_iounmap,
+        .name                   = "iSeries",
+        .setup_arch             = iSeries_setup_arch,
+        .show_cpuinfo           = iSeries_show_cpuinfo,
+        .init_IRQ               = iSeries_init_IRQ,
+        .get_irq                = iSeries_get_irq,
+        .init_early             = iSeries_init_early,
+        .pcibios_fixup          = iSeries_pci_final_fixup,
+        .pcibios_fixup_resources= iSeries_pcibios_fixup_resources,
+        .restart                = mf_reboot,
+        .power_off              = mf_power_off,
+        .halt                   = mf_power_off,
+        .get_boot_time          = iSeries_get_boot_time,
+        .set_rtc_time           = iSeries_set_rtc_time,
+        .get_rtc_time           = iSeries_get_rtc_time,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = iSeries_progress,
+        .probe                  = iseries_probe,
+        .ioremap                = iseries_ioremap,
+        .iounmap                = iseries_iounmap,
         /* XXX Implement enable_pmcs for iSeries */
 };