Merge branch 'upstream'

4 files changed, 95 insertions, 28 deletions

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index c82abeb59d3a..071ae24be892 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -26,6 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
+#include <linux/smp_lock.h>
 #include <asm/irq.h>
 #include <asm/ebus.h>
 #include <asm/oplib.h>
@@ -394,6 +395,28 @@ static int wd_ioctl(struct inode *inode, struct file *file,
         return(0);
 }
 
+static long wd_compat_ioctl(struct file *file, unsigned int cmd,
+                unsigned long arg)
+{
+        int rval = -ENOIOCTLCMD;
+
+        switch (cmd) {
+        /* solaris ioctls are specific to this driver */
+        case WIOCSTART:
+        case WIOCSTOP:
+        case WIOCGSTAT:
+                lock_kernel();
+                rval = wd_ioctl(file->f_dentry->d_inode, file, cmd, arg);
+                lock_kernel();
+                break;
+        /* everything else is handled by the generic compat layer */
+        default:
+                break;
+        }
+
+        return rval;
+}
+
 static ssize_t wd_write(struct file     *file, 
                         const char      __user *buf, 
                         size_t          count, 
@@ -441,6 +464,7 @@ static irqreturn_t wd_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static struct file_operations wd_fops = {
         .owner =        THIS_MODULE,
         .ioctl =        wd_ioctl,
+        .compat_ioctl = wd_compat_ioctl,
         .open =         wd_open,
         .write =        wd_write,
         .read =         wd_read,
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 24ed5893b4f0..39f54213a6d5 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/miscdevice.h>
 #include <linux/ioport.h>               /* request_region */
+#include <linux/smp_lock.h>
 #include <asm/atomic.h>
 #include <asm/ebus.h>                   /* EBus device                                  */
 #include <asm/oplib.h>                  /* OpenProm Library                     */
@@ -114,22 +115,25 @@ static int d7s_release(struct inode *inode, struct file *f)
         return 0;
 }
 
-static int d7s_ioctl(struct inode *inode, struct file *f, 
-                     unsigned int cmd, unsigned long arg)
+static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         __u8 regs = readb(d7s_regs);
         __u8 ireg = 0;
+        int error = 0
 
-        if (D7S_MINOR != iminor(inode))
+        if (D7S_MINOR != iminor(file->f_dentry->d_inode))
                 return -ENODEV;
 
+        lock_kernel();
         switch (cmd) {
         case D7SIOCWR:
                 /* assign device register values
                  * we mask-out D7S_FLIP if in sol_compat mode
                  */
-                if (get_user(ireg, (int __user *) arg))
-                        return -EFAULT;
+                if (get_user(ireg, (int __user *) arg)) {
+                        error = -EFAULT;
+                        break;
+                }
                 if (0 != sol_compat) {
                         (regs & D7S_FLIP) ? 
                                 (ireg |= D7S_FLIP) : (ireg &= ~D7S_FLIP);
@@ -144,8 +148,10 @@ static int d7s_ioctl(struct inode *inode, struct file *f,
                  * This driver will not misinform you about the state
                  * of your hardware while in sol_compat mode
                  */
-                if (put_user(regs, (int __user *) arg))
-                        return -EFAULT;
+                if (put_user(regs, (int __user *) arg)) {
+                        error = -EFAULT;
+                        break;
+                }
                 break;
 
         case D7SIOCTM:
@@ -155,15 +161,17 @@ static int d7s_ioctl(struct inode *inode, struct file *f,
                 writeb(regs, d7s_regs);
                 break;
         };
+        lock_kernel();
 
-        return 0;
+        return error;
 }
 
 static struct file_operations d7s_fops = {
-        .owner =        THIS_MODULE,
-        .ioctl =        d7s_ioctl,
-        .open =         d7s_open,
-        .release =      d7s_release,
+        .owner =                THIS_MODULE,
+        .unlocked_ioctl =       d7s_ioctl,
+        .compat_ioctl =         d7s_ioctl,
+        .open =                 d7s_open,
+        .release =              d7s_release,
 };
 
 static struct miscdevice d7s_miscdev = { D7S_MINOR, D7S_DEVNAME, &d7s_fops };
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index b0cc3c2588fd..19e8eddf887a 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -654,9 +654,8 @@ envctrl_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 /* Function Description: Command what to read.  Mapped to user ioctl().
  * Return: Gives 0 for implemented commands, -EINVAL otherwise.
  */
-static int
-envctrl_ioctl(struct inode *inode, struct file *file,
-              unsigned int cmd, unsigned long arg)
+static long
+envctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         char __user *infobuf;
 
@@ -715,11 +714,14 @@ envctrl_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations envctrl_fops = {
-        .owner =        THIS_MODULE,
-        .read =         envctrl_read,
-        .ioctl =        envctrl_ioctl,
-        .open =         envctrl_open,
-        .release =      envctrl_release,
+        .owner =                THIS_MODULE,
+        .read =                 envctrl_read,
+        .unlocked_ioctl =       envctrl_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl =         envctrl_ioctl,
+#endif
+        .open =                 envctrl_open,
+        .release =              envctrl_release,
 };      
 
 static struct miscdevice envctrl_dev = {
@@ -1125,10 +1127,9 @@ out_deregister:
         misc_deregister(&envctrl_dev);
 out_iounmap:
         iounmap(i2c);
-        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++) {
-                if (i2c_childlist[i].tables)
-                        kfree(i2c_childlist[i].tables);
-        }
+        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++)
+                kfree(i2c_childlist[i].tables);
+
         return err;
 }
 
@@ -1141,10 +1142,8 @@ static void __exit envctrl_cleanup(void)
         iounmap(i2c);
         misc_deregister(&envctrl_dev);
 
-        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++) {
-                if (i2c_childlist[i].tables)
-                        kfree(i2c_childlist[i].tables);
-        }
+        for (i = 0; i < ENVCTRL_MAX_CPU * 2; i++)
+                kfree(i2c_childlist[i].tables);
 }
 
 module_init(envctrl_init);
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 58ed33749571..383a95f34a0d 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -39,6 +39,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/miscdevice.h>
+#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <asm/oplib.h>
@@ -565,6 +566,40 @@ static int openprom_ioctl(struct inode * inode, struct file * file,
         }
 }
 
+static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
+                unsigned long arg)
+{
+        long rval = -ENOTTY;
+
+        /*
+         * SunOS/Solaris only, the NetBSD one's have embedded pointers in
+         * the arg which we'd need to clean up...
+         */
+        switch (cmd) {
+        case OPROMGETOPT:
+        case OPROMSETOPT:
+        case OPROMNXTOPT:
+        case OPROMSETOPT2:
+        case OPROMNEXT:
+        case OPROMCHILD:
+        case OPROMGETPROP:
+        case OPROMNXTPROP:
+        case OPROMU2P:
+        case OPROMGETCONS:
+        case OPROMGETFBNAME:
+        case OPROMGETBOOTARGS:
+        case OPROMSETCUR:
+        case OPROMPCI2NODE:
+        case OPROMPATH2NODE:
+                lock_kernel();
+                rval = openprom_ioctl(file->f_dentry->d_inode, file, cmd, arg);
+                lock_kernel();
+                break;
+        }
+
+        return rval;
+}
+
 static int openprom_open(struct inode * inode, struct file * file)
 {
         DATA *data;
@@ -590,6 +625,7 @@ static struct file_operations openprom_fops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
         .ioctl =        openprom_ioctl,
+        .compat_ioctl = openprom_compat_ioctl,
         .open =         openprom_open,
         .release =      openprom_release,
 };