diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-20 19:07:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-20 19:07:25 -0700 |
| commit | c536fc74b4b41ca5cfdebad60943be1ecd092ba1 (patch) | |
| tree | 3c3a65e315bd9d8897e7b98b93cc347fc1ddf438 /net/atm/resources.h | |
| parent | f78cdbd75a57245ecc68f5a40e470933426a082b (diff) | |
| parent | 0edecc020b33f8e31d8baa80735b45e8e8434700 (diff) | |
Merge branch 'uaccess.net' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Al Viro says:
====================
uaccess-related stuff in net/*
Assorted uaccess-related work in net/*. First, there's
getting rid of compat_alloc_user_space() mess in MCAST_...
[gs]etsockopt() - no need to play with copying to/from temporary
object on userland stack, etc., when ->compat_[sg]etsockopt()
instances in question can easly do everything without that.
That's the first 13 patches. Then there's a trivial bit in
net/batman-adv (completely unrelated to everything else) and
finally getting the atm compat ioctls into simpler shape.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/resources.h')
| -rw-r--r-- | net/atm/resources.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/atm/resources.h b/net/atm/resources.h index 048232e4d4c6..4a0839e92ff3 100644 --- a/net/atm/resources.h +++ b/net/atm/resources.h @@ -14,8 +14,9 @@ extern struct list_head atm_devs; extern struct mutex atm_dev_mutex; -int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat); - +int atm_getnames(void __user *buf, int __user *iobuf_len); +int atm_dev_ioctl(unsigned int cmd, void __user *buf, int __user *sioc_len, + int number, int compat); #ifdef CONFIG_PROC_FS |