fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / char / watchdog / eurotechwdt.c

diff --git a/drivers/char/watchdog/eurotechwdt.c b/drivers/char/watchdog/eurotechwdt.c
index ab28ca2..e228d6e 100644 (file)
--- a/drivers/char/watchdog/eurotechwdt.c
+++ b/drivers/char/watchdog/eurotechwdt.c
@@ -40,7 +40,6 @@
  *     Added Matt Domsch's nowayout module option.
  */
 
-#include <linux/config.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -72,12 +71,7 @@ static char *ev = "int";
 
 #define WDT_TIMEOUT            60                /* 1 minute */
 
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
-
+static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
 
@@ -159,7 +153,7 @@ static void eurwdt_activate_timer(void)
  * Kernel methods.
  */
 
-static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t eurwdt_interrupt(int irq, void *dev_id)
 {
        printk(KERN_CRIT "timeout WDT timeout\n");
 
@@ -167,7 +161,7 @@ static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        printk(KERN_CRIT "Would Reboot.\n");
 #else
        printk(KERN_CRIT "Initiating system reboot.\n");
-       machine_restart(NULL);
+       emergency_restart();
 #endif
        return IRQ_HANDLED;
 }
@@ -196,13 +190,9 @@ static void eurwdt_ping(void)
  * write of data will do, as we we don't define content meaning.
  */
 
-static ssize_t eurwdt_write(struct file *file, const char *buf, size_t count,
-loff_t *ppos)
+static ssize_t eurwdt_write(struct file *file, const char __user *buf,
+size_t count, loff_t *ppos)
 {
-       /*  Can't seek (pwrite) on this device  */
-       if (ppos != &file->f_pos)
-       return -ESPIPE;
-
        if (count)      {
                if (!nowayout) {
                        size_t i;
@@ -237,6 +227,8 @@ loff_t *ppos)
 static int eurwdt_ioctl(struct inode *inode, struct file *file,
        unsigned int cmd, unsigned long arg)
 {
+       void __user *argp = (void __user *)arg;
+       int __user *p = argp;
        static struct watchdog_info ident = {
                .options          = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
                .firmware_version = 1,
@@ -248,22 +240,21 @@ static int eurwdt_ioctl(struct inode *inode, struct file *file,
 
        switch(cmd) {
        default:
-               return -ENOIOCTLCMD;
+               return -ENOTTY;
 
        case WDIOC_GETSUPPORT:
-               return copy_to_user((struct watchdog_info *)arg, &ident,
-                       sizeof(ident)) ? -EFAULT : 0;
+               return copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
 
        case WDIOC_GETSTATUS:
        case WDIOC_GETBOOTSTATUS:
-               return put_user(0, (int *) arg);
+               return put_user(0, p);
 
        case WDIOC_KEEPALIVE:
                eurwdt_ping();
                return 0;
 
        case WDIOC_SETTIMEOUT:
-               if (copy_from_user(&time, (int *) arg, sizeof(int)))
+               if (copy_from_user(&time, p, sizeof(int)))
                        return -EFAULT;
 
                /* Sanity check */
@@ -275,10 +266,10 @@ static int eurwdt_ioctl(struct inode *inode, struct file *file,
                /* Fall */
 
        case WDIOC_GETTIMEOUT:
-               return put_user(eurwdt_timeout, (int *)arg);
+               return put_user(eurwdt_timeout, p);
 
        case WDIOC_SETOPTIONS:
-               if (get_user(options, (int *)arg))
+               if (get_user(options, p))
                        return -EFAULT;
                if (options & WDIOS_DISABLECARD) {
                        eurwdt_disable_timer();
@@ -309,7 +300,7 @@ static int eurwdt_open(struct inode *inode, struct file *file)
        eurwdt_timeout = WDT_TIMEOUT;   /* initial timeout */
        /* Activate the WDT */
        eurwdt_activate_timer();
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 /**
@@ -365,7 +356,7 @@ static int eurwdt_notify_sys(struct notifier_block *this, unsigned long code,
  */
 
 
-static struct file_operations eurwdt_fops = {
+static const struct file_operations eurwdt_fops = {
        .owner  = THIS_MODULE,
        .llseek = no_llseek,
        .write  = eurwdt_write,
@@ -429,7 +420,7 @@ static int __init eurwdt_init(void)
                goto out;
        }
 
-       ret = request_irq(irq, eurwdt_interrupt, SA_INTERRUPT, "eurwdt", NULL);
+       ret = request_irq(irq, eurwdt_interrupt, IRQF_DISABLED, "eurwdt", NULL);
        if(ret) {
                printk(KERN_ERR "eurwdt: IRQ %d is not free.\n", irq);
                goto outmisc;