Merge branch 'master'

8 files changed, 58 insertions, 106 deletions

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 38353621069e..43d9229fca07 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-rc1
-# Wed Jul 12 14:00:58 2006
+# Linux kernel version: 2.6.18-rc2
+# Fri Jul 21 14:19:24 2006
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -36,6 +36,7 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
@@ -1120,7 +1121,7 @@ CONFIG_USB_HIDDEV=y
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
-# CONFIG_USB_CY7C63 is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
 # CONFIG_USB_PHIDGETKIT is not set
 # CONFIG_USB_PHIDGETSERVO is not set
@@ -1279,7 +1280,6 @@ CONFIG_RAMFS=y
 # CONFIG_NFSD is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_CIFS is not set
-# CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c
index f8ef2f2b9b37..ec10f7edcf86 100644
--- a/arch/sparc64/kernel/devices.c
+++ b/arch/sparc64/kernel/devices.c
@@ -66,9 +66,6 @@ static int check_cpu_node(struct device_node *dp, int *cur_inst,
                           void *compare_arg,
                           struct device_node **dev_node, int *mid)
 {
-        if (strcmp(dp->type, "cpu"))
-                return -ENODEV;
-
         if (!compare(dp, *cur_inst, compare_arg)) {
                 if (dev_node)
                         *dev_node = dp;
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 7064cee290ae..238bbf6de07d 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -542,9 +542,17 @@ static void __init build_device_resources(struct of_device *op,
         /* Convert to num-cells.  */
         num_reg /= 4;
 
-        /* Conver to num-entries.  */
+        /* Convert to num-entries.  */
         num_reg /= na + ns;
 
+        /* Prevent overruning the op->resources[] array.  */
+        if (num_reg > PROMREG_MAX) {
+                printk(KERN_WARNING "%s: Too many regs (%d), "
+                       "limiting to %d.\n",
+                       op->node->full_name, num_reg, PROMREG_MAX);
+                num_reg = PROMREG_MAX;
+        }
+
         for (index = 0; index < num_reg; index++) {
                 struct resource *r = &op->resource[index];
                 u32 addr[OF_MAX_ADDR_CELLS];
@@ -650,8 +658,22 @@ apply_interrupt_map(struct device_node *dp, struct device_node *pp,
         next:
                 imap += (na + 3);
         }
-        if (i == imlen)
+        if (i == imlen) {
+                /* Psycho and Sabre PCI controllers can have 'interrupt-map'
+                 * properties that do not include the on-board device
+                 * interrupts.  Instead, the device's 'interrupts' property
+                 * is already a fully specified INO value.
+                 *
+                 * Handle this by deciding that, if we didn't get a
+                 * match in the parent's 'interrupt-map', and the
+                 * parent is an IRQ translater, then use the parent as
+                 * our IRQ controller.
+                 */
+                if (pp->irq_trans)
+                        return pp;
+
                 return NULL;
+        }
 
         *irq_p = irq;
         cp = of_find_node_by_phandle(handle);
@@ -803,6 +825,14 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
                 op->num_irqs = 0;
         }
 
+        /* Prevent overruning the op->irqs[] array.  */
+        if (op->num_irqs > PROMINTR_MAX) {
+                printk(KERN_WARNING "%s: Too many irqs (%d), "
+                       "limiting to %d.\n",
+                       dp->full_name, op->num_irqs, PROMINTR_MAX);
+                op->num_irqs = PROMINTR_MAX;
+        }
+
         build_device_resources(op, parent);
         for (i = 0; i < op->num_irqs; i++)
                 op->irqs[i] = build_one_device_irq(op, parent, op->irqs[i]);
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index c86007a2aa3f..5cc5ab63293f 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -344,10 +344,12 @@ static unsigned long __psycho_onboard_imap_off[] = {
 /*0x2f*/        PSYCHO_IMAP_CE,
 /*0x30*/        PSYCHO_IMAP_A_ERR,
 /*0x31*/        PSYCHO_IMAP_B_ERR,
-/*0x32*/        PSYCHO_IMAP_PMGMT
+/*0x32*/        PSYCHO_IMAP_PMGMT,
+/*0x33*/        PSYCHO_IMAP_GFX,
+/*0x34*/        PSYCHO_IMAP_EUPA,
 };
 #define PSYCHO_ONBOARD_IRQ_BASE         0x20
-#define PSYCHO_ONBOARD_IRQ_LAST         0x32
+#define PSYCHO_ONBOARD_IRQ_LAST         0x34
 #define psycho_onboard_imap_offset(__ino) \
         __psycho_onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE]
 
@@ -529,6 +531,10 @@ static unsigned long __sabre_onboard_imap_off[] = {
 /*0x2e*/        SABRE_IMAP_UE,
 /*0x2f*/        SABRE_IMAP_CE,
 /*0x30*/        SABRE_IMAP_PCIERR,
+/*0x31*/        0 /* reserved */,
+/*0x32*/        0 /* reserved */,
+/*0x33*/        SABRE_IMAP_GFX,
+/*0x34*/        SABRE_IMAP_EUPA,
 };
 #define SABRE_ONBOARD_IRQ_BASE          0x20
 #define SABRE_ONBOARD_IRQ_LAST          0x30
@@ -895,6 +901,8 @@ static unsigned long sysio_irq_offsets[] = {
         SYSIO_IMAP_CE,
         SYSIO_IMAP_SBERR,
         SYSIO_IMAP_PMGMT,
+        SYSIO_IMAP_GFX,
+        SYSIO_IMAP_EUPA,
 };
 
 #undef bogon
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 237524d87cab..beffc82a1e85 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -254,7 +254,6 @@ EXPORT_SYMBOL(prom_getproperty);
 EXPORT_SYMBOL(prom_node_has_property);
 EXPORT_SYMBOL(prom_setprop);
 EXPORT_SYMBOL(saved_command_line);
-EXPORT_SYMBOL(prom_getname);
 EXPORT_SYMBOL(prom_finddevice);
 EXPORT_SYMBOL(prom_feval);
 EXPORT_SYMBOL(prom_getbool);
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 51c056df528e..054d0abdb7ee 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -701,21 +701,21 @@ extern void check_pending(int signum);
 
 asmlinkage long sys_getdomainname(char __user *name, int len)
 {
-        int nlen;
-        int err = -EFAULT;
+        int nlen, err;
+
+        if (len < 0 || len > __NEW_UTS_LEN)
+                return -EINVAL;
 
         down_read(&uts_sem);
         
         nlen = strlen(system_utsname.domainname) + 1;
-
         if (nlen < len)
                 len = nlen;
-        if (len > __NEW_UTS_LEN)
-                goto done;
-        if (copy_to_user(name, system_utsname.domainname, len))
-                goto done;
-        err = 0;
-done:
+
+        err = -EFAULT;
+        if (!copy_to_user(name, system_utsname.domainname, len))
+                err = 0;
+
         up_read(&uts_sem);
         return err;
 }
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c
index 1605967cce91..55ae802dc0ad 100644
--- a/arch/sparc64/mm/fault.c
+++ b/arch/sparc64/mm/fault.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
+#include <linux/kallsyms.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -132,6 +133,8 @@ static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
 
         printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
                regs->tpc);
+        printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
+        print_symbol("RPC: <%s>\n", regs->u_regs[15]);
         printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
         __asm__("mov %%sp, %0" : "=r" (ksp));
         show_stack(current, ksp);
diff --git a/arch/sparc64/prom/tree.c b/arch/sparc64/prom/tree.c
index 49075abd7cbc..500f05e2cfcb 100644
--- a/arch/sparc64/prom/tree.c
+++ b/arch/sparc64/prom/tree.c
@@ -193,91 +193,6 @@ prom_searchsiblings(int node_start, const char *nodename)
         return 0;
 }
 
-/* Gets name in the {name@x,yyyyy|name (if no reg)} form */
-int 
-prom_getname (int node, char *buffer, int len)
-{
-        int i, sbus = 0;
-        int pci = 0, ebus = 0, ide = 0;
-        struct linux_prom_registers *reg;
-        struct linux_prom64_registers reg64[PROMREG_MAX];
-        
-        for (sbus = prom_getparent (node); sbus; sbus = prom_getparent (sbus)) {
-                i = prom_getproperty (sbus, "name", buffer, len);
-                if (i > 0) {
-                        buffer [i] = 0;
-                        if (!strcmp (buffer, "sbus"))
-                                goto getit;
-                }
-        }
-        if ((pci = prom_getparent (node))) {
-                i = prom_getproperty (pci, "name", buffer, len);
-                if (i > 0) {
-                        buffer [i] = 0;
-                        if (!strcmp (buffer, "pci"))
-                                goto getit;
-                }
-                pci = 0;
-        }
-        if ((ebus = prom_getparent (node))) {
-                i = prom_getproperty (ebus, "name", buffer, len);
-                if (i > 0) {
-                        buffer[i] = 0;
-                        if (!strcmp (buffer, "ebus"))
-                                goto getit;
-                }
-                ebus = 0;
-        }
-        if ((ide = prom_getparent (node))) {
-                i = prom_getproperty (ide, "name", buffer, len);
-                if (i > 0) {
-                        buffer [i] = 0;
-                        if (!strcmp (buffer, "ide"))
-                                goto getit;
-                }
-                ide = 0;
-        }
-getit:
-        i = prom_getproperty (node, "name", buffer, len);
-        if (i <= 0) {
-                buffer [0] = 0;
-                return -1;
-        }
-        buffer [i] = 0;
-        len -= i;
-        i = prom_getproperty (node, "reg", (char *)reg64, sizeof (reg64));
-        if (i <= 0) return 0;
-        if (len < 16) return -1;
-        buffer = strchr (buffer, 0);
-        if (sbus) {
-                reg = (struct linux_prom_registers *)reg64;
-                sprintf (buffer, "@%x,%x", reg[0].which_io, (uint)reg[0].phys_addr);
-        } else if (pci) {
-                int dev, fn;
-                reg = (struct linux_prom_registers *)reg64;
-                fn = (reg[0].which_io >> 8) & 0x07;
-                dev = (reg[0].which_io >> 11) & 0x1f;
-                if (fn)
-                        sprintf (buffer, "@%x,%x", dev, fn);
-                else
-                        sprintf (buffer, "@%x", dev);
-        } else if (ebus) {
-                reg = (struct linux_prom_registers *)reg64;
-                sprintf (buffer, "@%x,%x", reg[0].which_io, reg[0].phys_addr);
-        } else if (ide) {
-                reg = (struct linux_prom_registers *)reg64;
-                sprintf (buffer, "@%x,%x", reg[0].which_io, reg[0].phys_addr);
-        } else if (i == 4) {    /* Happens on 8042's children on Ultra/PCI. */
-                reg = (struct linux_prom_registers *)reg64;
-                sprintf (buffer, "@%x", reg[0].which_io);
-        } else {
-                sprintf (buffer, "@%x,%x",
-                         (unsigned int)(reg64[0].phys_addr >> 36),
-                         (unsigned int)(reg64[0].phys_addr));
-        }
-        return 0;
-}
-
 /* Return the first property type for node 'node'.
  * buffer should be at least 32B in length
  */