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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: remove some pointless conditionals before kfree()
  sbus: changed ioctls to unlocked
  sparc: asm/atomic.h on 32bit should include asm/system.h for xchg
  sparc64: Fix smp_callin() locking.

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index e6d1fc8c54f1..a85ad05e8548 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -383,18 +383,22 @@ static int jsf_ioctl_program(void __user *arg)
         return 0;
 }
 
-static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd,
-    unsigned long arg)
+static long jsf_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 {
+        lock_kernel();
         int error = -ENOTTY;
         void __user *argp = (void __user *)arg;
 
-        if (!capable(CAP_SYS_ADMIN))
+        if (!capable(CAP_SYS_ADMIN)) {
+                unlock_kernel();
                 return -EPERM;
+        }
         switch (cmd) {
         case JSFLASH_IDENT:
-                if (copy_to_user(argp, &jsf0.id, JSFIDSZ))
+                if (copy_to_user(argp, &jsf0.id, JSFIDSZ)) {
+                        unlock_kernel();
                         return -EFAULT;
+                }
                 break;
         case JSFLASH_ERASE:
                 error = jsf_ioctl_erase(arg);
@@ -404,6 +408,7 @@ static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd,
                 break;
         }
 
+        unlock_kernel();
         return error;
 }
 
@@ -439,7 +444,7 @@ static const struct file_operations jsf_fops = {
         .llseek =       jsf_lseek,
         .read =         jsf_read,
         .write =        jsf_write,
-        .ioctl =        jsf_ioctl,
+        .unlocked_ioctl =       jsf_ioctl,
         .mmap =         jsf_mmap,
         .open =         jsf_open,
         .release =      jsf_release,