9 files changed, 77 insertions, 31 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 9cb24d20f0f9..b2b5d664d328 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -235,6 +235,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_ppc970,
                 .cpu_restore            = __restore_cpu_ppc970,
                 .oprofile_cpu_type      = "ppc64/970MP",
@@ -251,6 +252,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_ppc970MP,
                 .cpu_restore            = __restore_cpu_ppc970,
                 .oprofile_cpu_type      = "ppc64/970MP",
@@ -317,6 +319,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power6",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
@@ -335,6 +338,7 @@ static struct cpu_spec cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power6",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
@@ -836,7 +840,7 @@ static struct cpu_spec cpu_specs[] = {
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x80040000,
                 .cpu_name               = "7448",
-                .cpu_features           = CPU_FTRS_7447A,
+                .cpu_features           = CPU_FTRS_7448,
                 .cpu_user_features      = COMMON_USER |
                         PPC_FEATURE_HAS_ALTIVEC_COMP | PPC_FEATURE_PPC_LE,
                 .icache_bsize           = 32,
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index c29d1652a421..4074c0b31453 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -596,7 +596,11 @@ fast_exception_return:
         mr      r12,r4          /* restart at exc_exit_restart */
         b       2b
 
-        .comm   fee_restarts,4
+        .section .bss
+        .align  2
+fee_restarts:
+        .space  4
+        .previous
 
 /* aargh, a nonrecoverable interrupt, panic */
 /* aargh, we don't know which trap this is */
@@ -851,7 +855,11 @@ load_dbcr0:
         mtspr   SPRN_DBSR,r11   /* clear all pending debug events */
         blr
 
-        .comm   global_dbcr0,8
+        .section .bss
+        .align  4
+global_dbcr0:
+        .space  8
+        .previous
 #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
 
 do_work:                        /* r10 contains MSR_KERNEL here */
@@ -926,7 +934,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
         /* shouldn't return */
         b       4b
 
-        .comm   ee_restarts,4
+        .section .bss
+        .align  2
+ee_restarts:
+        .space  4
+        .previous
 
 /*
  * PROM code for specific machines follows.  Put it
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 84c34d979a88..d501c23e5159 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -427,11 +427,13 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,
         /* Process "ranges" property */
         pci_process_bridge_OF_ranges(phb, dev->node, 0);
 
-        /* Setup IO space.
-         * This will not work properly for ISA IOs, something needs to be done
-         * about it if we ever generalize that way of probing PCI brigdes
+        /* Setup IO space. We use the non-dynamic version of that code here,
+         * which doesn't quite support unplugging. Next kernel release will
+         * have a better fix for this.
+         * Note also that we don't do ISA, this will also be fixed with a
+         * more massive rework.
          */
-        pci_setup_phb_io_dynamic(phb, 0);
+        pci_setup_phb_io(phb, 0);
 
         /* Init pci_dn data structures */
         pci_devs_phb_init_dynamic(phb);
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index b0409e19b1c1..249cca27a9b8 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -41,6 +41,7 @@
 
 unsigned long pci_probe_only = 1;
 int pci_assign_all_buses = 0;
+static int pci_initial_scan_done;
 
 static void fixup_resource(struct resource *res, struct pci_dev *dev);
 static void do_bus_setup(struct pci_bus *bus);
@@ -604,6 +605,8 @@ static int __init pcibios_init(void)
                 /* map in PCI I/O space */
                 phbs_remap_io();
 
+        pci_initial_scan_done = 1;
+
         printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
 
         return 0;
@@ -1042,13 +1045,16 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
         }
 }
 
-void __init pci_setup_phb_io(struct pci_controller *hose, int primary)
+void __devinit pci_setup_phb_io(struct pci_controller *hose, int primary)
 {
         unsigned long size = hose->pci_io_size;
         unsigned long io_virt_offset;
         struct resource *res;
         struct device_node *isa_dn;
 
+        if (size == 0)
+                return;
+
         hose->io_base_virt = reserve_phb_iospace(size);
         DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
                 hose->global_number, hose->io_base_phys,
@@ -1069,6 +1075,15 @@ void __init pci_setup_phb_io(struct pci_controller *hose, int primary)
         res = &hose->io_resource;
         res->start += io_virt_offset;
         res->end += io_virt_offset;
+
+        /* If this is called after the initial PCI scan, then we need to
+         * proceed to IO mappings now
+         */
+        if (pci_initial_scan_done)
+                __ioremap_explicit(hose->io_base_phys,
+                                   (unsigned long)hose->io_base_virt,
+                                   hose->pci_io_size,
+                                   _PAGE_NO_CACHE | _PAGE_GUARDED);
 }
 
 void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose,
@@ -1078,6 +1093,9 @@ void __devinit pci_setup_phb_io_dynamic(struct pci_controller *hose,
         unsigned long io_virt_offset;
         struct resource *res;
 
+        if (size == 0)
+                return;
+
         hose->io_base_virt = __ioremap(hose->io_base_phys, size,
                                         _PAGE_NO_CACHE | _PAGE_GUARDED);
         DBG("phb%d io_base_phys 0x%lx io_base_virt 0x%lx\n",
@@ -1106,6 +1124,9 @@ static int get_bus_io_range(struct pci_bus *bus, unsigned long *start_phys,
                 /* Root Bus */
                 res = &hose->io_resource;
 
+        if (res->end == 0 && res->start == 0)
+                return 1;
+
         *start_virt = pci_io_base + res->start;
         *start_phys = *start_virt + hose->io_base_phys
                 - (unsigned long) hose->io_base_virt;
diff --git a/arch/powerpc/kernel/pmc.c b/arch/powerpc/kernel/pmc.c
index 24d7b7c99bb9..ea04e0ab3f2f 100644
--- a/arch/powerpc/kernel/pmc.c
+++ b/arch/powerpc/kernel/pmc.c
@@ -20,8 +20,8 @@
 #include <asm/cputable.h>
 #include <asm/pmc.h>
 
-#ifndef MMCR0_PMA0
-#define MMCR0_PMA0      0
+#ifndef MMCR0_PMAO
+#define MMCR0_PMAO      0
 #endif
 
 static void dummy_perf(struct pt_regs *regs)
@@ -30,7 +30,7 @@ static void dummy_perf(struct pt_regs *regs)
         mtpmr(PMRN_PMGC0, mfpmr(PMRN_PMGC0) & ~PMGC0_PMIE);
 #elif defined(CONFIG_PPC64) || defined(CONFIG_6xx)
         if (cur_cpu_spec->pmc_type == PPC_PMC_IBM)
-                mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~(MMCR0_PMXE|MMCR0_PMA0));
+                mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~(MMCR0_PMXE|MMCR0_PMAO));
 #else
         mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~MMCR0_PMXE);
 #endif
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index c065b5550368..066a6a7a25b8 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1472,6 +1472,11 @@ static int of_finish_dynamic_node(struct device_node *node)
         node->name = of_get_property(node, "name", NULL);
         node->type = of_get_property(node, "device_type", NULL);
 
+        if (!node->name)
+                node->name = "<NULL>";
+        if (!node->type)
+                node->type = "<NULL>";
+
         if (!parent) {
                 err = -ENODEV;
                 goto out;
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index 190b7ed1dbfb..f2e3bc714d76 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -379,7 +379,7 @@ static ssize_t ppc_rtas_progress_write(struct file *file,
 /* ****************************************************************** */
 static int ppc_rtas_progress_show(struct seq_file *m, void *v)
 {
-        if (progress_led)
+        if (progress_led[0])
                 seq_printf(m, "%s\n", progress_led);
         return 0;
 }
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 22f1ef1b3100..d577b71db375 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -201,13 +201,6 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic,
         /* Can deadlock when called with interrupts disabled */
         WARN_ON(irqs_disabled());
 
-        /* remove 'self' from the map */
-        if (cpu_isset(smp_processor_id(), map))
-                cpu_clear(smp_processor_id(), map);
-
-        /* sanity check the map, remove any non-online processors. */
-        cpus_and(map, map, cpu_online_map);
-
         if (unlikely(smp_ops == NULL))
                 return ret;
 
@@ -222,10 +215,17 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic,
         /* Must grab online cpu count with preempt disabled, otherwise
          * it can change. */
         num_cpus = num_online_cpus() - 1;
-        if (!num_cpus || cpus_empty(map)) {
-                ret = 0;
-                goto out;
-        }
+        if (!num_cpus)
+                goto done;
+
+        /* remove 'self' from the map */
+        if (cpu_isset(smp_processor_id(), map))
+                cpu_clear(smp_processor_id(), map);
+
+        /* sanity check the map, remove any non-online processors. */
+        cpus_and(map, map, cpu_online_map);
+        if (cpus_empty(map))
+                goto done;
 
         call_data = &data;
         smp_wmb();
@@ -263,6 +263,7 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic,
                 }
         }
 
+ done:
         ret = 0;
 
  out:
@@ -282,16 +283,17 @@ EXPORT_SYMBOL(smp_call_function);
 int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int nonatomic,
                         int wait)
 {
-        cpumask_t map=CPU_MASK_NONE;
+        cpumask_t map = CPU_MASK_NONE;
+        int ret = -EBUSY;
 
         if (!cpu_online(cpu))
                 return -EINVAL;
 
-        if (cpu == smp_processor_id())
-                return -EBUSY;
-
         cpu_set(cpu, map);
-        return smp_call_function_map(func,info,nonatomic,wait,map);
+        if (cpu != get_cpu())
+                ret = smp_call_function_map(func,info,nonatomic,wait,map);
+        put_cpu();
+        return ret;
 }
 EXPORT_SYMBOL(smp_call_function_single);
 
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 132067313147..21c39ff2dc39 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -34,7 +34,7 @@ SECTIONS
         /* Text and gots */
         .text : {
                 _text = .;
-                *(.text .text.*)
+                TEXT_TEXT
                 SCHED_TEXT
                 LOCK_TEXT
                 KPROBES_TEXT
@@ -167,7 +167,7 @@ SECTIONS
 #ifdef CONFIG_PPC32
         .data    :
         {
-                *(.data)
+                DATA_DATA
                 *(.sdata)
                 *(.got.plt) *(.got)
         }