diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:42:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:42:23 -0800 |
| commit | d27ba47e7e8c466c18983a1779d611f82d6a354f (patch) | |
| tree | 2870d82516be16e0cae63e1f7e84bd855bb34a23 /drivers/sbus/char/cpwatchdog.c | |
| parent | e3d8b77bc7a89d190ee895d0570af10c026e5086 (diff) | |
| parent | dd3e2dcf3408843ed35501c28626f389b30be756 (diff) | |
| download | op-kernel-dev-d27ba47e7e8c466c18983a1779d611f82d6a354f.zip op-kernel-dev-d27ba47e7e8c466c18983a1779d611f82d6a354f.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/sbus/char/cpwatchdog.c')
| -rw-r--r-- | drivers/sbus/char/cpwatchdog.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index c82abeb..071ae24 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, |
