14 files changed, 120 insertions, 85 deletions

diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c
index b66336db00ee..e724c54af029 100644
--- a/arch/sparc64/kernel/central.c
+++ b/arch/sparc64/kernel/central.c
@@ -126,6 +126,10 @@ static void probe_other_fhcs(void)
                 int board;
                 u32 tmp;
 
+                if (dp->parent &&
+                    dp->parent->parent != NULL)
+                        continue;
+
                 fhc = (struct linux_fhc *)
                         central_alloc_bootmem(sizeof(struct linux_fhc));
                 if (fhc == NULL)
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index 2df25c2b4071..35bf895fdeee 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -389,12 +389,12 @@ static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_de
         dev->ofdev.node = dp;
         dev->ofdev.dev.parent = &dev->bus->ofdev.dev;
         dev->ofdev.dev.bus = &ebus_bus_type;
-        strcpy(dev->ofdev.dev.bus_id, dp->path_component_name);
+        sprintf(dev->ofdev.dev.bus_id, "ebus[%08x]", dp->node);
 
         /* Register with core */
         if (of_device_register(&dev->ofdev) != 0)
                 printk(KERN_DEBUG "ebus: device registration error for %s!\n",
-                       dev->ofdev.dev.bus_id);
+                       dp->path_component_name);
 
         dp = dp->child;
         if (dp) {
@@ -494,12 +494,12 @@ void __init ebus_init(void)
                 ebus->ofdev.node = dp;
                 ebus->ofdev.dev.parent = &pdev->dev;
                 ebus->ofdev.dev.bus = &ebus_bus_type;
-                strcpy(ebus->ofdev.dev.bus_id, dp->path_component_name);
+                sprintf(ebus->ofdev.dev.bus_id, "ebus%d", num_ebus);
 
                 /* Register with core */
                 if (of_device_register(&ebus->ofdev) != 0)
                         printk(KERN_DEBUG "ebus: device registration error for %s!\n",
-                               ebus->ofdev.dev.bus_id);
+                               dp->path_component_name);
 
 
                 child = dp->child;
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 0aaa35fc5a9c..6f28bec0a9bf 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -22,11 +22,10 @@
 #include <asm/auxio.h>
 #include <asm/sfafsr.h>
 #include <asm/pil.h>
+#include <asm/unistd.h>
 
 #define curptr      g6
 
-#define NR_SYSCALLS 300      /* Each OS is different... */
-
         .text
         .align          32
 
diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
index 0f3aec72ef5f..f028e68b23f2 100644
--- a/arch/sparc64/kernel/isa.c
+++ b/arch/sparc64/kernel/isa.c
@@ -115,12 +115,12 @@ static void __init isa_fill_devices(struct sparc_isa_bridge *isa_br)
                 isa_dev->ofdev.node = dp;
                 isa_dev->ofdev.dev.parent = &isa_br->ofdev.dev;
                 isa_dev->ofdev.dev.bus = &isa_bus_type;
-                strcpy(isa_dev->ofdev.dev.bus_id, dp->path_component_name);
+                sprintf(isa_dev->ofdev.dev.bus_id, "isa[%08x]", dp->node);
 
                 /* Register with core */
                 if (of_device_register(&isa_dev->ofdev) != 0) {
                         printk(KERN_DEBUG "isa: device registration error for %s!\n",
-                               isa_dev->ofdev.dev.bus_id);
+                               dp->path_component_name);
                         kfree(isa_dev);
                         goto next_sibling;
                 }
@@ -191,12 +191,12 @@ void __init isa_init(void)
                 isa_br->ofdev.node = dp;
                 isa_br->ofdev.dev.parent = &pdev->dev;
                 isa_br->ofdev.dev.bus = &isa_bus_type;
-                strcpy(isa_br->ofdev.dev.bus_id, dp->path_component_name);
+                sprintf(isa_br->ofdev.dev.bus_id, "isa%d", index);
 
                 /* Register with core */
                 if (of_device_register(&isa_br->ofdev) != 0) {
                         printk(KERN_DEBUG "isa: device registration error for %s!\n",
-                               isa_br->ofdev.dev.bus_id);
+                               dp->path_component_name);
                         kfree(isa_br);
                         return;
                 }
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index d822c7c18e1f..8cc14fc6b6f1 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -131,8 +131,13 @@ static int of_device_resume(struct device * dev)
 void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name)
 {
         unsigned long ret = res->start + offset;
+        struct resource *r;
 
-        if (!request_region(ret, size, name))
+        if (res->flags & IORESOURCE_MEM)
+                r = request_mem_region(ret, size, name);
+        else
+                r = request_region(ret, size, name);
+        if (!r)
                 ret = 0;
 
         return (void __iomem *) ret;
@@ -397,16 +402,22 @@ static void of_bus_sbus_count_cells(struct device_node *child,
                 *sizec = 1;
 }
 
-static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)
-{
-        return of_bus_default_map(addr, range, na, ns, pna);
-}
-
-static unsigned int of_bus_sbus_get_flags(u32 *addr)
+/*
+ * FHC/Central bus specific translator.
+ *
+ * This is just needed to hard-code the address and size cell
+ * counts.  'fhc' and 'central' nodes lack the #address-cells and
+ * #size-cells properties, and if you walk to the root on such
+ * Enterprise boxes all you'll get is a #size-cells of 2 which is
+ * not what we want to use.
+ */
+static int of_bus_fhc_match(struct device_node *np)
 {
-        return IORESOURCE_MEM;
+        return !strcmp(np->name, "fhc") ||
+                !strcmp(np->name, "central");
 }
 
+#define of_bus_fhc_count_cells of_bus_sbus_count_cells
 
 /*
  * Array of bus specific translators
@@ -428,8 +439,17 @@ static struct of_bus of_busses[] = {
                 .addr_prop_name = "reg",
                 .match = of_bus_sbus_match,
                 .count_cells = of_bus_sbus_count_cells,
-                .map = of_bus_sbus_map,
-                .get_flags = of_bus_sbus_get_flags,
+                .map = of_bus_default_map,
+                .get_flags = of_bus_default_get_flags,
+        },
+        /* FHC */
+        {
+                .name = "fhc",
+                .addr_prop_name = "reg",
+                .match = of_bus_fhc_match,
+                .count_cells = of_bus_fhc_count_cells,
+                .map = of_bus_default_map,
+                .get_flags = of_bus_default_get_flags,
         },
         /* Default */
         {
@@ -841,7 +861,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
         if (!parent)
                 strcpy(op->dev.bus_id, "root");
         else
-                sprintf(op->dev.bus_id, "%s@%08x", dp->name, dp->node);
+                sprintf(op->dev.bus_id, "%08x", dp->node);
 
         if (of_device_register(op)) {
                 printk("%s: Could not register of device.\n",
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index e02f01b644af..dfc41cd4bb5d 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -646,13 +646,4 @@ int pci_domain_nr(struct pci_bus *pbus)
 }
 EXPORT_SYMBOL(pci_domain_nr);
 
-int pcibios_prep_mwi(struct pci_dev *dev)
-{
-        /* We set correct PCI_CACHE_LINE_SIZE register values for every
-         * device probed on this platform.  So there is nothing to check
-         * and this always succeeds.
-         */
-        return 0;
-}
-
 #endif /* !(CONFIG_PCI) */
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 7a59cc72c844..827ae30aa497 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -330,19 +330,6 @@ __init get_device_resource(struct linux_prom_pci_registers *ap,
         return res;
 }
 
-static int __init pdev_resource_collisions_expected(struct pci_dev *pdev)
-{
-        if (pdev->vendor != PCI_VENDOR_ID_SUN)
-                return 0;
-
-        if (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS ||
-            pdev->device == PCI_DEVICE_ID_SUN_RIO_1394 ||
-            pdev->device == PCI_DEVICE_ID_SUN_RIO_USB)
-                return 1;
-
-        return 0;
-}
-
 static void __init pdev_record_assignments(struct pci_pbm_info *pbm,
                                            struct pci_dev *pdev)
 {
@@ -400,19 +387,23 @@ static void __init pdev_record_assignments(struct pci_pbm_info *pbm,
                 pbm->parent->resource_adjust(pdev, res, root);
 
                 if (request_resource(root, res) < 0) {
+                        int rnum;
+
                         /* OK, there is some conflict.  But this is fine
                          * since we'll reassign it in the fixup pass.
                          *
-                         * We notify the user that OBP made an error if it
-                         * is a case we don't expect.
+                         * Do not print the warning for ROM resources
+                         * as such a conflict is quite common and
+                         * harmless as the ROM bar is disabled.
                          */
-                        if (!pdev_resource_collisions_expected(pdev)) {
-                                printk(KERN_ERR "PCI: Address space collision on region %ld "
+                        rnum = (res - &pdev->resource[0]);
+                        if (rnum != PCI_ROM_RESOURCE)
+                                printk(KERN_ERR "PCI: Resource collision, "
+                                       "region %d "
                                        "[%016lx:%016lx] of device %s\n",
-                                       (res - &pdev->resource[0]),
+                                       rnum,
                                        res->start, res->end,
                                        pci_name(pdev));
-                        }
                 }
         }
 }
diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index 82e5455134c6..2e7f1427088a 100644
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -281,7 +281,7 @@ static void pci_4u_free_consistent(struct pci_dev *pdev, size_t size, void *cpu,
 
         spin_lock_irqsave(&iommu->lock, flags);
 
-        free_npages(iommu, dvma, npages);
+        free_npages(iommu, dvma - iommu->page_table_map_base, npages);
 
         spin_unlock_irqrestore(&iommu->lock, flags);
 
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 6ec569828c29..94bb681f2323 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -1196,7 +1196,7 @@ static void pbm_register_toplevel_resources(struct pci_controller_info *p,
                                             &pbm->mem_space);
 }
 
-static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp, u32 dma_begin)
+static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp, u32 dma_start, u32 dma_end)
 {
         struct pci_pbm_info *pbm;
         struct device_node *node;
@@ -1261,6 +1261,8 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp
                 node = node->sibling;
         }
         if (simbas_found == 0) {
+                struct resource *rp;
+
                 /* No APBs underneath, probably this is a hummingbird
                  * system.
                  */
@@ -1302,8 +1304,10 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp
                 pbm->io_space.end   = pbm->io_space.start + (1UL << 24) - 1UL;
                 pbm->io_space.flags = IORESOURCE_IO;
 
-                pbm->mem_space.start = p->pbm_A.controller_regs + SABRE_MEMSPACE;
-                pbm->mem_space.end   = pbm->mem_space.start + (unsigned long)dma_begin - 1UL;
+                pbm->mem_space.start =
+                        (p->pbm_A.controller_regs + SABRE_MEMSPACE);
+                pbm->mem_space.end =
+                        (pbm->mem_space.start + ((1UL << 32UL) - 1UL));
                 pbm->mem_space.flags = IORESOURCE_MEM;
 
                 if (request_resource(&ioport_resource, &pbm->io_space) < 0) {
@@ -1315,6 +1319,17 @@ static void sabre_pbm_init(struct pci_controller_info *p, struct device_node *dp
                         prom_halt();
                 }
 
+                rp = kmalloc(sizeof(*rp), GFP_KERNEL);
+                if (!rp) {
+                        prom_printf("Cannot allocate IOMMU resource.\n");
+                        prom_halt();
+                }
+                rp->name = "IOMMU";
+                rp->start = pbm->mem_space.start + (unsigned long) dma_start;
+                rp->end = pbm->mem_space.start + (unsigned long) dma_end - 1UL;
+                rp->flags = IORESOURCE_BUSY;
+                request_resource(&pbm->mem_space, rp);
+
                 pci_register_legacy_regions(&pbm->io_space,
                                             &pbm->mem_space);
         }
@@ -1450,5 +1465,5 @@ void sabre_init(struct device_node *dp, char *model_name)
         /*
          * Look for APB underneath.
          */
-        sabre_pbm_init(p, dp, vdma[0]);
+        sabre_pbm_init(p, dp, vdma[0], vdma[0] + vdma[1]);
 }
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index e21cd6afa709..0917c24c4f08 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -793,7 +793,7 @@ static unsigned int schizo_irq_build(struct device_node *dp,
         return virt_irq;
 }
 
-static void schizo_irq_trans_init(struct device_node *dp)
+static void __schizo_irq_trans_init(struct device_node *dp, int is_tomatillo)
 {
         struct linux_prom64_registers *regs;
         struct schizo_irq_data *irq_data;
@@ -807,11 +807,24 @@ static void schizo_irq_trans_init(struct device_node *dp)
         dp->irq_trans->data = irq_data;
 
         irq_data->pbm_regs = regs[0].phys_addr;
-        irq_data->sync_reg = regs[3].phys_addr + 0x1a18UL;
+        if (is_tomatillo)
+                irq_data->sync_reg = regs[3].phys_addr + 0x1a18UL;
+        else
+                irq_data->sync_reg = 0UL;
         irq_data->portid = of_getintprop_default(dp, "portid", 0);
         irq_data->chip_version = of_getintprop_default(dp, "version#", 0);
 }
 
+static void schizo_irq_trans_init(struct device_node *dp)
+{
+        __schizo_irq_trans_init(dp, 0);
+}
+
+static void tomatillo_irq_trans_init(struct device_node *dp)
+{
+        __schizo_irq_trans_init(dp, 1);
+}
+
 static unsigned int pci_sun4v_irq_build(struct device_node *dp,
                                         unsigned int devino,
                                         void *_data)
@@ -1050,8 +1063,8 @@ static struct irq_trans pci_irq_trans_table[] = {
         { "pci108e,8001", schizo_irq_trans_init },
         { "SUNW,schizo+", schizo_irq_trans_init },
         { "pci108e,8002", schizo_irq_trans_init },
-        { "SUNW,tomatillo", schizo_irq_trans_init },
-        { "pci108e,a801", schizo_irq_trans_init },
+        { "SUNW,tomatillo", tomatillo_irq_trans_init },
+        { "pci108e,a801", tomatillo_irq_trans_init },
         { "SUNW,sun4v-pci", pci_sun4v_irq_trans_init },
 };
 #endif
@@ -1079,23 +1092,22 @@ static void sun4v_vdev_irq_trans_init(struct device_node *dp)
 
 static void irq_trans_init(struct device_node *dp)
 {
-        const char *model;
 #ifdef CONFIG_PCI
+        const char *model;
         int i;
 #endif
 
+#ifdef CONFIG_PCI
         model = of_get_property(dp, "model", NULL);
         if (!model)
                 model = of_get_property(dp, "compatible", NULL);
-        if (!model)
-                return;
-
-#ifdef CONFIG_PCI
-        for (i = 0; i < ARRAY_SIZE(pci_irq_trans_table); i++) {
-                struct irq_trans *t = &pci_irq_trans_table[i];
+        if (model) {
+                for (i = 0; i < ARRAY_SIZE(pci_irq_trans_table); i++) {
+                        struct irq_trans *t = &pci_irq_trans_table[i];
 
-                if (!strcmp(model, t->name))
-                        return t->init(dp);
+                        if (!strcmp(model, t->name))
+                                return t->init(dp);
+                }
         }
 #endif
 #ifdef CONFIG_SBUS
@@ -1103,8 +1115,9 @@ static void irq_trans_init(struct device_node *dp)
             !strcmp(dp->name, "sbi"))
                 return sbus_irq_trans_init(dp);
 #endif
-        if (!strcmp(dp->name, "central"))
-                return central_irq_trans_init(dp->child);
+        if (!strcmp(dp->name, "fhc") &&
+            !strcmp(dp->parent->name, "central"))
+                return central_irq_trans_init(dp);
         if (!strcmp(dp->name, "virtual-devices"))
                 return sun4v_vdev_irq_trans_init(dp);
 }
@@ -1516,7 +1529,7 @@ static char * __init get_one_property(phandle node, const char *name)
         return buf;
 }
 
-static struct device_node * __init create_node(phandle node)
+static struct device_node * __init create_node(phandle node, struct device_node *parent)
 {
         struct device_node *dp;
 
@@ -1525,6 +1538,7 @@ static struct device_node * __init create_node(phandle node)
 
         dp = prom_early_alloc(sizeof(*dp));
         dp->unique_id = unique_id++;
+        dp->parent = parent;
 
         kref_init(&dp->kref);
 
@@ -1543,12 +1557,11 @@ static struct device_node * __init build_tree(struct device_node *parent, phandl
 {
         struct device_node *dp;
 
-        dp = create_node(node);
+        dp = create_node(node, parent);
         if (dp) {
                 *(*nextp) = dp;
                 *nextp = &dp->allnext;
 
-                dp->parent = parent;
                 dp->path_component_name = build_path_component(dp);
                 dp->full_name = build_full_name(dp);
 
@@ -1564,7 +1577,7 @@ void __init prom_build_devicetree(void)
 {
         struct device_node **nextp;
 
-        allnodes = create_node(prom_root_node);
+        allnodes = create_node(prom_root_node, NULL);
         allnodes->path_component_name = "";
         allnodes->full_name = "/";
 
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index cc8ad480a204..bf033b31d437 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -74,7 +74,6 @@ prom_console_write(struct console *con, const char *s, unsigned n)
 
 unsigned int boot_flags = 0;
 #define BOOTME_DEBUG  0x1
-#define BOOTME_SINGLE 0x2
 
 /* Exported for mm/init.c:paging_init. */
 unsigned long cmdline_memory_size = 0;
@@ -102,7 +101,6 @@ static void __init process_switch(char c)
                 boot_flags |= BOOTME_DEBUG;
                 break;
         case 's':
-                boot_flags |= BOOTME_SINGLE;
                 break;
         case 'h':
                 prom_printf("boot_flags_init: Halt!\n");
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index 419a63fca172..9a8026797ac0 100644
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -79,7 +79,7 @@ sys_call_table32:
         .word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_fstatat64
 /*290*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
         .word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare
-/*300*/ .word compat_sys_set_robust_list, compat_sys_get_robust_list
+/*300*/ .word compat_sys_set_robust_list, compat_sys_get_robust_list, compat_sys_migrate_pages
 
 #endif /* CONFIG_COMPAT */
 
@@ -149,7 +149,7 @@ sys_call_table:
         .word sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64
 /*290*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
         .word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare
-/*300*/ .word sys_set_robust_list, sys_get_robust_list
+/*300*/ .word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages
 
 #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \
     defined(CONFIG_SOLARIS_EMUL_MODULE)
@@ -262,5 +262,7 @@ sunos_sys_table:
 /*290*/ .word sunos_nosys, sunos_nosys, sunos_nosys
         .word sunos_nosys, sunos_nosys, sunos_nosys
         .word sunos_nosys, sunos_nosys, sunos_nosys
-        .word sunos_nosys, sunos_nosys, sunos_nosys
+        .word sunos_nosys
+/*300*/ .word sunos_nosys, sunos_nosys, sunos_nosys
+
 #endif
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index 68420e2dad0e..fe1796c939c3 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -87,6 +87,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
                        i + 1,
                        p->trapstack[i].tstate, p->trapstack[i].tpc,
                        p->trapstack[i].tnpc, p->trapstack[i].tt);
+                print_symbol("TRAPLOG: TPC<%s>\n", p->trapstack[i].tpc);
         }
 }
 
@@ -1134,6 +1135,9 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
         printk("%s" "ERROR(%d): TPC[%lx] TNPC[%lx] O7[%lx] TSTATE[%lx]\n",
                (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
                regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
+        printk("%s" "ERROR(%d): ",
+               (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
+        print_symbol("TPC<%s>\n", regs->tpc);
         printk("%s" "ERROR(%d): M_SYND(%lx),  E_SYND(%lx)%s%s\n",
                (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
                (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
@@ -1741,6 +1745,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
                        smp_processor_id(),
                        (type & 0x1) ? 'I' : 'D',
                        regs->tpc);
+                print_symbol(KERN_EMERG "TPC<%s>\n", regs->tpc);
                 panic("Irrecoverable Cheetah+ parity error.");
         }
 
@@ -1748,6 +1753,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
                smp_processor_id(),
                (type & 0x1) ? 'I' : 'D',
                regs->tpc);
+        print_symbol(KERN_WARNING "TPC<%s>\n", regs->tpc);
 }
 
 struct sun4v_error_entry {
@@ -1946,6 +1952,7 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
 
         printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
                regs->tpc, tl);
+        print_symbol(KERN_EMERG "SUN4V-ITLB: TPC<%s>\n", regs->tpc);
         printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
                "pte[%lx] error[%lx]\n",
                sun4v_err_itlb_vaddr, sun4v_err_itlb_ctx,
@@ -1966,6 +1973,7 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
 
         printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
                regs->tpc, tl);
+        print_symbol(KERN_EMERG "SUN4V-DTLB: TPC<%s>\n", regs->tpc);
         printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
                "pte[%lx] error[%lx]\n",
                sun4v_err_dtlb_vaddr, sun4v_err_dtlb_ctx,
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S
index b097379a49a8..bd9de8c2a2aa 100644
--- a/arch/sparc64/kernel/vmlinux.lds.S
+++ b/arch/sparc64/kernel/vmlinux.lds.S
@@ -57,13 +57,7 @@ SECTIONS
   __setup_end = .;
   __initcall_start = .;
   .initcall.init : {
-        *(.initcall1.init) 
-        *(.initcall2.init) 
-        *(.initcall3.init) 
-        *(.initcall4.init) 
-        *(.initcall5.init) 
-        *(.initcall6.init) 
-        *(.initcall7.init)
+        INITCALLS
   }
   __initcall_end = .;
   __con_initcall_start = .;