git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
s390
/
char
/
vmwatchdog.c
diff --git
a/drivers/s390/char/vmwatchdog.c
b/drivers/s390/char/vmwatchdog.c
index
5acc0ac
..
807320a
100644
(file)
--- a/
drivers/s390/char/vmwatchdog.c
+++ b/
drivers/s390/char/vmwatchdog.c
@@
-193,7
+193,7
@@
static int vmwdt_ioctl(struct inode *i, struct file *f,
return 0;
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
- return put_user(0, (int *)arg);
+ return put_user(0, (int
__user
*)arg);
case WDIOC_GETTEMP:
return -EINVAL;
case WDIOC_SETOPTIONS: