Commit 019453ef authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sparse: more wan annotations

parent 53f97fb4
......@@ -454,7 +454,7 @@ static int dlci_del(struct dlci_add *dlci)
return(err);
}
static int dlci_ioctl(unsigned int cmd, void *arg)
static int dlci_ioctl(unsigned int cmd, void __user *arg)
{
struct dlci_add add;
int err;
......
......@@ -191,7 +191,7 @@ struct frad_local
int buffer; /* current buffer for S508 firmware */
};
extern void dlci_ioctl_set(int (*hook)(unsigned int, void *));
extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *));
#endif /* __KERNEL__ */
......
......@@ -58,7 +58,7 @@
struct sdla_mem {
int addr;
int len;
void *data;
void __user *data;
};
#define SDLA_START (FRAD_LAST_IOCTL + 7)
......
......@@ -751,9 +751,9 @@ void vlan_ioctl_set(int (*hook)(void __user *))
EXPORT_SYMBOL(vlan_ioctl_set);
static DECLARE_MUTEX(dlci_ioctl_mutex);
static int (*dlci_ioctl_hook)(unsigned int, void *);
static int (*dlci_ioctl_hook)(unsigned int, void __user *);
void dlci_ioctl_set(int (*hook)(unsigned int, void *))
void dlci_ioctl_set(int (*hook)(unsigned int, void __user *))
{
down(&dlci_ioctl_mutex);
dlci_ioctl_hook = hook;
......@@ -832,7 +832,7 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
if (dlci_ioctl_hook) {
down(&dlci_ioctl_mutex);
err = dlci_ioctl_hook(cmd, (void *)arg);
err = dlci_ioctl_hook(cmd, argp);
up(&dlci_ioctl_mutex);
}
break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment