summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAl Viro2005-12-15 10:18:05 +0100
committerLinus Torvalds2005-12-15 19:04:30 +0100
commite896fd9861181140617aa9ff3a54dac25e46351d (patch)
tree557fc0b8d7189ce2aa25a979bb044bb6ebb64bec /drivers/char
parent[PATCH] dell_rbu: NULL noise removal (diff)
downloadkernel-qcow2-linux-e896fd9861181140617aa9ff3a54dac25e46351d.tar.gz
kernel-qcow2-linux-e896fd9861181140617aa9ff3a54dac25e46351d.tar.xz
kernel-qcow2-linux-e896fd9861181140617aa9ff3a54dac25e46351d.zip
[PATCH] wdrtas.c: fix __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/wdrtas.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c
index 619e2ffca33f..dacfe31caccf 100644
--- a/drivers/char/watchdog/wdrtas.c
+++ b/drivers/char/watchdog/wdrtas.c
@@ -320,7 +320,7 @@ static int
wdrtas_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- int __user *argp = (void *)arg;
+ int __user *argp = (void __user *)arg;
int i;
static struct watchdog_info wdinfo = {
.options = WDRTAS_SUPPORTED_MASK,