3 files changed, 11 insertions, 8 deletions

diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
index 81c0cbd96ff0..75ac24d229b1 100644
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@@ -277,7 +277,7 @@ void __init ebus_init(void)
         struct pci_dev *pdev;
         struct pcidev_cookie *cookie;
         struct device_node *dp;
-        unsigned long addr, *base;
+        struct resource *p;
         unsigned short pci_command;
         int len, reg, nreg;
         int num_ebus = 0;
@@ -321,13 +321,12 @@ void __init ebus_init(void)
                 }
                 nreg = len / sizeof(struct linux_prom_pci_registers);
 
-                base = &ebus->self->resource[0].start;
+                p = &ebus->self->resource[0];
                 for (reg = 0; reg < nreg; reg++) {
                         if (!(regs[reg].which_io & 0x03000000))
                                 continue;
 
-                        addr = regs[reg].phys_lo;
-                        *base++ = addr;
+                        (p++)->start = regs[reg].phys_lo;
                 }
 
                 ebus->ofdev.node = dp;
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 8654b446ac9e..d33f8a07ccac 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -508,6 +508,7 @@ void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *s
 
 void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
 {
+#ifndef CONFIG_SUN4
         struct device_node *parent = dp->parent;
 
         if (sparc_cpu_model != sun4d &&
@@ -524,6 +525,7 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
 
                 iounit_init(dp->node, parent->node, sbus);
         }
+#endif
 }
 
 void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index 94ff58c9d4a9..896863fb208a 100644
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -470,19 +470,21 @@ asmlinkage int sys_getdomainname(char __user *name, int len)
 {
         int nlen, err;
         
-        if (len < 0 || len > __NEW_UTS_LEN)
+        if (len < 0)
                 return -EINVAL;
 
         down_read(&uts_sem);
         
         nlen = strlen(system_utsname.domainname) + 1;
-        if (nlen < len)
-                len = nlen;
+        err = -EINVAL;
+        if (nlen > len)
+                goto out;
 
         err = -EFAULT;
-        if (!copy_to_user(name, system_utsname.domainname, len))
+        if (!copy_to_user(name, system_utsname.domainname, nlen))
                 err = 0;
 
+out:
         up_read(&uts_sem);
         return err;
 }