diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 09:53:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 09:53:51 -0800 |
| commit | 980110c5da56cb56d3356f5a5251fdc920f83ba6 (patch) | |
| tree | e435f3c3b69cae3ffebf780c0a905b92ccd3289d /drivers/char | |
| parent | 5cdddecc8b423308798453484149297a503e9cc0 (diff) | |
| parent | c4c283357d865aad1f124c069f5f6e3f39e76790 (diff) | |
| download | linux-3.10-980110c5da56cb56d3356f5a5251fdc920f83ba6.tar.gz linux-3.10-980110c5da56cb56d3356f5a5251fdc920f83ba6.tar.bz2 linux-3.10-980110c5da56cb56d3356f5a5251fdc920f83ba6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] add Nano 7240 driver
[WATCHDOG] ipmi: add the standard watchdog timeout ioctls
[WATCHDOG] IT8212F watchdog driver
[WATCHDOG] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED
[WATCHDOG] bfin_wdt, remove SPIN_LOCK_UNLOCKED
[WATCHDOG] Stop looking for device as soon as one is found
[WATCHDOG] at32ap700x_wdt: add support for boot status and add fix for silicon errata
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index e686fc92516..8f45ca9235a 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -669,6 +669,7 @@ static int ipmi_ioctl(struct inode *inode, struct file *file, return 0; case WDIOC_SET_PRETIMEOUT: + case WDIOC_SETPRETIMEOUT: i = copy_from_user(&val, argp, sizeof(int)); if (i) return -EFAULT; @@ -676,6 +677,7 @@ static int ipmi_ioctl(struct inode *inode, struct file *file, return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY); case WDIOC_GET_PRETIMEOUT: + case WDIOC_GETPRETIMEOUT: i = copy_to_user(argp, &pretimeout, sizeof(pretimeout)); if (i) return -EFAULT; |