Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
  sparc: Support show_unhandled_signals.
  sparc: use __ratelimit
  sunxvr500: Additional PCI id for sunxvr500 driver
  sparc: use asm-generic/scatterlist.h
  sparc64: If 'slot-names' property exist, create sysfs PCI slot information.
  sparc: remove trailing space in messages
  sparc: remove redundant return statements

8 files changed, 82 insertions, 18 deletions

diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c
index b062de9424a4..62dc7a021413 100644
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
@@ -143,6 +143,4 @@ void __init device_scan(void)
 
         if (ARCH_SUN4C)
                 sun4c_probe_memerr_reg();
-
-        return;
 }
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 87f1760c0aa2..0409d62d8ca2 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -124,7 +124,7 @@ void __init leon_init_timers(irq_handler_t counter_fn)
 
                 if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) &
                       (1<<LEON3_GPTIMER_SEPIRQ))) {
-                        prom_printf("irq timer not configured with seperate irqs \n");
+                        prom_printf("irq timer not configured with separate irqs\n");
                         BUG();
                 }
 
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index 05c0dadd6371..85787577f683 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -177,7 +177,7 @@ void __init leon_boot_cpus(void)
         int nrcpu = leon_smp_nrcpus();
         int me = smp_processor_id();
 
-        printk(KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x \n", (unsigned int)me,
+        printk(KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x\n", (unsigned int)me,
                (unsigned int)nrcpu, (unsigned int)NR_CPUS,
                (unsigned int)&(leon3_irqctrl_regs->mpstatus));
 
@@ -226,7 +226,7 @@ int __cpuinit leon_boot_one_cpu(int i)
                         break;
                 udelay(200);
         }
-        printk(KERN_INFO "Started CPU %d \n", (unsigned int)i);
+        printk(KERN_INFO "Started CPU %d\n", (unsigned int)i);
 
         if (!(cpu_callin_map[i])) {
                 printk(KERN_ERR "Processor %d is stuck.\n", i);
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 37b66c60abe3..5ac539a5930f 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -1095,3 +1095,78 @@ static int __init pcibios_init(void)
         return 0;
 }
 subsys_initcall(pcibios_init);
+
+#ifdef CONFIG_SYSFS
+static void __devinit pci_bus_slot_names(struct device_node *node,
+                                         struct pci_bus *bus)
+{
+        const struct pci_slot_names {
+                u32     slot_mask;
+                char    names[0];
+        } *prop;
+        const char *sp;
+        int len, i;
+        u32 mask;
+
+        prop = of_get_property(node, "slot-names", &len);
+        if (!prop)
+                return;
+
+        mask = prop->slot_mask;
+        sp = prop->names;
+
+        if (ofpci_verbose)
+                printk("PCI: Making slots for [%s] mask[0x%02x]\n",
+                       node->full_name, mask);
+
+        i = 0;
+        while (mask) {
+                struct pci_slot *pci_slot;
+                u32 this_bit = 1 << i;
+
+                if (!(mask & this_bit)) {
+                        i++;
+                        continue;
+                }
+
+                if (ofpci_verbose)
+                        printk("PCI: Making slot [%s]\n", sp);
+
+                pci_slot = pci_create_slot(bus, i, sp, NULL);
+                if (IS_ERR(pci_slot))
+                        printk(KERN_ERR "PCI: pci_create_slot returned %ld\n",
+                               PTR_ERR(pci_slot));
+
+                sp += strlen(sp) + 1;
+                mask &= ~this_bit;
+                i++;
+        }
+}
+
+static int __init of_pci_slot_init(void)
+{
+        struct pci_bus *pbus = NULL;
+
+        while ((pbus = pci_find_next_bus(pbus)) != NULL) {
+                struct device_node *node;
+
+                if (pbus->self) {
+                        struct dev_archdata *sd = pbus->self->sysdata;
+
+                        /* PCI->PCI bridge */
+                        node = sd->prom_node;
+                } else {
+                        struct pci_pbm_info *pbm = pbus->sysdata;
+
+                        /* Host PCI controller */
+                        node = pbm->op->node;
+                }
+
+                pci_bus_slot_names(node, pbus);
+        }
+
+        return 0;
+}
+
+module_init(of_pci_slot_init);
+#endif
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 75e88c00bca3..d36a8d391ca0 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -585,8 +585,6 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
                         writew(ivec, pcic->pcic_regs+PCI_INT_SELECT_LO);
                 }
         }
-
-        return;
 }
 
 /*
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 9be2af55c5cd..b22ce6100403 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -95,8 +95,6 @@ static void prom_sync_me(void)
                              "nop\n\t"
                              "nop\n\t" : : "r" (prom_tbr));
         local_irq_restore(flags);
-
-        return;
 }
 
 static unsigned int boot_flags __initdata = 0;
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 68791cad7b74..482f2ab92692 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -194,7 +194,7 @@ int __cpuinit smp4d_boot_one_cpu(int i)
                         smp_penguin_ctable.reg_size = 0;
 
                         /* whirrr, whirrr, whirrrrrrrrr... */
-                        SMP_PRINTK(("Starting CPU %d at %p \n", i, entry));
+                        SMP_PRINTK(("Starting CPU %d at %p\n", i, entry));
                         local_flush_cache_all();
                         prom_startcpu(cpu_node,
                                       &smp_penguin_ctable, 0, (char *)entry);
diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
index 378ca82b9ccc..ebce43018c49 100644
--- a/arch/sparc/kernel/unaligned_64.c
+++ b/arch/sparc/kernel/unaligned_64.c
@@ -21,6 +21,7 @@
 #include <linux/smp.h>
 #include <linux/bitops.h>
 #include <linux/perf_event.h>
+#include <linux/ratelimit.h>
 #include <asm/fpumacro.h>
 
 enum direction {
@@ -274,13 +275,9 @@ static void kernel_mna_trap_fault(int fixup_tstate_asi)
 
 static void log_unaligned(struct pt_regs *regs)
 {
-        static unsigned long count, last_time;
+        static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
 
-        if (time_after(jiffies, last_time + 5 * HZ))
-                count = 0;
-        if (count < 5) {
-                last_time = jiffies;
-                count++;
+        if (__ratelimit(&ratelimit)) {
                 printk("Kernel unaligned access at TPC[%lx] %pS\n",
                        regs->tpc, (void *) regs->tpc);
         }
@@ -636,7 +633,6 @@ daex:
                 return;
         }
         advance(regs);
-        return;
 }
 
 void handle_stdfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr)
@@ -685,5 +681,4 @@ daex:
                 return;
         }
         advance(regs);
-        return;
 }