4 files changed, 24 insertions, 41 deletions

diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 778f22fd85d2..dbcb85994f46 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -22,6 +22,7 @@
 #include <linux/elf.h>
 #include <linux/elfcore.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/types.h>
 
 #include <asm/processor.h>
@@ -174,6 +175,8 @@ static void crash_kexec_prepare_cpus(void)
 
 void default_machine_crash_shutdown(struct pt_regs *regs)
 {
+        unsigned int irq;
+
         /*
          * This function is only called after the system
          * has paniced or is otherwise in a critical state.
@@ -186,6 +189,16 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
          */
         local_irq_disable();
 
+        for_each_irq(irq) {
+                struct irq_desc *desc = irq_descp(irq);
+
+                if (desc->status & IRQ_INPROGRESS)
+                        desc->handler->end(irq);
+
+                if (!(desc->status & IRQ_DISABLED))
+                        desc->handler->disable(irq);
+        }
+
         if (ppc_md.kexec_cpu_down)
                 ppc_md.kexec_cpu_down(1, 0);
 
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index fd8214caedee..a13a93dfc655 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -106,8 +106,6 @@ EXPORT_SYMBOL(iowrite32_rep);
 
 void __iomem *ioport_map(unsigned long port, unsigned int len)
 {
-        if (!_IO_IS_VALID(port))
-                return NULL;
         return (void __iomem *) (port+pci_io_base);
 }
 
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 4c4449be81ce..e1b3b3ef1912 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -42,14 +42,6 @@
 unsigned long pci_probe_only = 1;
 int pci_assign_all_buses = 0;
 
-/*
- * legal IO pages under MAX_ISA_PORT.  This is to ensure we don't touch
- * devices we don't have access to.
- */
-unsigned long io_page_mask;
-
-EXPORT_SYMBOL(io_page_mask);
-
 #ifdef CONFIG_PPC_MULTIPLATFORM
 static void fixup_resource(struct resource *res, struct pci_dev *dev);
 static void do_bus_setup(struct pci_bus *bus);
@@ -605,7 +597,7 @@ static int __init pcibios_init(void)
         iSeries_pcibios_init(); 
 #endif
 
-        printk("PCI: Probing PCI hardware\n");
+        printk(KERN_DEBUG "PCI: Probing PCI hardware\n");
 
         /* Scan all of the recorded PCI controllers.  */
         list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
@@ -630,14 +622,14 @@ static int __init pcibios_init(void)
         /* Cache the location of the ISA bridge (if we have one) */
         ppc64_isabridge_dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
         if (ppc64_isabridge_dev != NULL)
-                printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
+                printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
         /* map in PCI I/O space */
         phbs_remap_io();
 #endif
 
-        printk("PCI: Probing PCI hardware done\n");
+        printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
 
         return 0;
 }
@@ -804,7 +796,7 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
         else
                 prot |= _PAGE_GUARDED;
 
-        printk("PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start,
+        printk(KERN_DEBUG "PCI map for %s:%lx, prot: %lx\n", pci_name(dev), rp->start,
                prot);
 
         return __pgprot(prot);
@@ -1104,8 +1096,6 @@ void __init pci_setup_phb_io(struct pci_controller *hose, int primary)
                         pci_process_ISA_OF_ranges(isa_dn, hose->io_base_phys,
                                                 hose->io_base_virt);
                         of_node_put(isa_dn);
-                        /* Allow all IO */
-                        io_page_mask = -1;
                 }
         }
 
@@ -1212,7 +1202,7 @@ int remap_bus_range(struct pci_bus *bus)
                 return 1;
         if (start_phys == 0)
                 return 1;
-        printk("mapping IO %lx -> %lx, size: %lx\n", start_phys, start_virt, size);
+        printk(KERN_DEBUG "mapping IO %lx -> %lx, size: %lx\n", start_phys, start_virt, size);
         if (__ioremap_explicit(start_phys, start_virt, size,
                                _PAGE_NO_CACHE | _PAGE_GUARDED))
                 return 1;
@@ -1232,27 +1222,13 @@ static void phbs_remap_io(void)
 static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
 {
         struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        unsigned long start, end, mask, offset;
+        unsigned long offset;
 
         if (res->flags & IORESOURCE_IO) {
                 offset = (unsigned long)hose->io_base_virt - pci_io_base;
 
-                start = res->start += offset;
-                end = res->end += offset;
-
-                /* Need to allow IO access to pages that are in the
-                   ISA range */
-                if (start < MAX_ISA_PORT) {
-                        if (end > MAX_ISA_PORT)
-                                end = MAX_ISA_PORT;
-
-                        start >>= PAGE_SHIFT;
-                        end >>= PAGE_SHIFT;
-
-                        /* get the range of pages for the map */
-                        mask = ((1 << (end+1)) - 1) ^ ((1 << start) - 1);
-                        io_page_mask |= mask;
-                }
+                res->start += offset;
+                res->end += offset;
         } else if (res->flags & IORESOURCE_MEM) {
                 res->start += hose->pci_mem_offset;
                 res->end += hose->pci_mem_offset;
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 24e3ad756de0..528e7f84cb67 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -76,7 +76,6 @@
 
 /* keep track of when we need to update the rtc */
 time_t last_rtc_update;
-extern int piranha_simulator;
 #ifdef CONFIG_PPC_ISERIES
 unsigned long iSeries_recal_titan = 0;
 unsigned long iSeries_recal_tb = 0; 
@@ -945,9 +944,9 @@ void __init time_init(void)
         } else {
                 /* Normal PowerPC with timebase register */
                 ppc_md.calibrate_decr();
-                printk(KERN_INFO "time_init: decrementer frequency = %lu.%.6lu MHz\n",
+                printk(KERN_DEBUG "time_init: decrementer frequency = %lu.%.6lu MHz\n",
                        ppc_tb_freq / 1000000, ppc_tb_freq % 1000000);
-                printk(KERN_INFO "time_init: processor frequency   = %lu.%.6lu MHz\n",
+                printk(KERN_DEBUG "time_init: processor frequency   = %lu.%.6lu MHz\n",
                        ppc_proc_freq / 1000000, ppc_proc_freq % 1000000);
                 tb_last_stamp = tb_last_jiffy = get_tb();
         }
@@ -1010,10 +1009,7 @@ void __init time_init(void)
         tb_to_ns_scale = scale;
         tb_to_ns_shift = shift;
 
-#ifdef CONFIG_PPC_ISERIES
-        if (!piranha_simulator)
-#endif
-                tm = get_boot_time();
+        tm = get_boot_time();
 
         write_seqlock_irqsave(&xtime_lock, flags);