diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 12:48:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-25 12:48:22 -0700 |
| commit | ba7d4f36a2ec7d6f8d9e5c6cabbc57469dd4dc22 (patch) | |
| tree | 270a5f21aaa73d4c2a0008ec8e60b9fdd199228e /fs/compat_ioctl.c | |
| parent | 5947a64a7e0c70cc16d5d1e5af3cf3b44535047a (diff) | |
| parent | 702ec3072ae61cdf018725b353ff043e196548a6 (diff) | |
Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull compat_ioctl fixes from Al Viro:
"A bunch of compat_ioctl fixes, mostly in bluetooth.
Hopefully, most of fs/compat_ioctl.c will get killed off over the next
few cycles; between this, tty series already merged and Arnd's work
this cycle ought to take a good chunk out of the damn thing..."
* 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
hidp: fix compat_ioctl
hidp: constify hidp_connection_add()
cmtp: fix compat_ioctl
bnep: fix compat_ioctl
compat_ioctl: trim the pointless includes
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 69 |
1 files changed, 1 insertions, 68 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 0c445a03e682..ce2cc2169040 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -22,37 +22,21 @@ #include <linux/smp.h> #include <linux/ioctl.h> #include <linux/if.h> -#include <linux/if_bridge.h> #include <linux/raid/md_u.h> -#include <linux/kd.h> -#include <linux/route.h> -#include <linux/in6.h> -#include <linux/ipv6_route.h> -#include <linux/skbuff.h> -#include <linux/netlink.h> -#include <linux/vt.h> #include <linux/falloc.h> -#include <linux/fs.h> #include <linux/file.h> -#include <linux/ppp_defs.h> #include <linux/ppp-ioctl.h> #include <linux/if_pppox.h> #include <linux/mtio.h> #include <linux/tty.h> #include <linux/vt_kern.h> -#include <linux/fb.h> -#include <linux/videodev2.h> -#include <linux/netdevice.h> #include <linux/raw.h> #include <linux/blkdev.h> -#include <linux/elevator.h> #include <linux/rtc.h> #include <linux/pci.h> #include <linux/serial.h> -#include <linux/if_tun.h> #include <linux/ctype.h> #include <linux/syscalls.h> -#include <linux/atalk.h> #include <linux/gfp.h> #include <linux/cec.h> @@ -74,32 +58,9 @@ #endif #include <linux/uaccess.h> -#include <linux/ethtool.h> -#include <linux/mii.h> -#include <linux/if_bonding.h> #include <linux/watchdog.h> #include <linux/soundcard.h> -#include <linux/lp.h> -#include <linux/ppdev.h> - -#include <linux/atm.h> -#include <linux/atmarp.h> -#include <linux/atmclip.h> -#include <linux/atmdev.h> -#include <linux/atmioc.h> -#include <linux/atmlec.h> -#include <linux/atmmpc.h> -#include <linux/atmsvc.h> -#include <linux/atm_tcp.h> -#include <linux/sonet.h> -#include <linux/atm_suni.h> - -#include <linux/usb.h> -#include <linux/usbdevice_fs.h> -#include <linux/nbd.h> -#include <linux/random.h> -#include <linux/filter.h> #include <linux/hiddev.h> @@ -112,6 +73,7 @@ #include <linux/sort.h> #ifdef CONFIG_SPARC +#include <linux/fb.h> #include <asm/fbio.h> #endif @@ -544,22 +506,6 @@ static int mt_ioctl_trans(struct file *file, #define HCIUARTSETFLAGS _IOW('U', 203, int) #define HCIUARTGETFLAGS _IOR('U', 204, int) -#define BNEPCONNADD _IOW('B', 200, int) -#define BNEPCONNDEL _IOW('B', 201, int) -#define BNEPGETCONNLIST _IOR('B', 210, int) -#define BNEPGETCONNINFO _IOR('B', 211, int) -#define BNEPGETSUPPFEAT _IOR('B', 212, int) - -#define CMTPCONNADD _IOW('C', 200, int) -#define CMTPCONNDEL _IOW('C', 201, int) -#define CMTPGETCONNLIST _IOR('C', 210, int) -#define CMTPGETCONNINFO _IOR('C', 211, int) - -#define HIDPCONNADD _IOW('H', 200, int) -#define HIDPCONNDEL _IOW('H', 201, int) -#define HIDPGETCONNLIST _IOR('H', 210, int) -#define HIDPGETCONNINFO _IOR('H', 211, int) - #define RTC_IRQP_READ32 _IOR('p', 0x0b, compat_ulong_t) #define RTC_IRQP_SET32 _IOW('p', 0x0c, compat_ulong_t) #define RTC_EPOCH_READ32 _IOR('p', 0x0d, compat_ulong_t) @@ -974,19 +920,6 @@ COMPATIBLE_IOCTL(RFCOMMRELEASEDEV) COMPATIBLE_IOCTL(RFCOMMGETDEVLIST) COMPATIBLE_IOCTL(RFCOMMGETDEVINFO) COMPATIBLE_IOCTL(RFCOMMSTEALDLC) -COMPATIBLE_IOCTL(BNEPCONNADD) -COMPATIBLE_IOCTL(BNEPCONNDEL) -COMPATIBLE_IOCTL(BNEPGETCONNLIST) -COMPATIBLE_IOCTL(BNEPGETCONNINFO) -COMPATIBLE_IOCTL(BNEPGETSUPPFEAT) -COMPATIBLE_IOCTL(CMTPCONNADD) -COMPATIBLE_IOCTL(CMTPCONNDEL) -COMPATIBLE_IOCTL(CMTPGETCONNLIST) -COMPATIBLE_IOCTL(CMTPGETCONNINFO) -COMPATIBLE_IOCTL(HIDPCONNADD) -COMPATIBLE_IOCTL(HIDPCONNDEL) -COMPATIBLE_IOCTL(HIDPGETCONNLIST) -COMPATIBLE_IOCTL(HIDPGETCONNINFO) /* CAPI */ COMPATIBLE_IOCTL(CAPI_REGISTER) COMPATIBLE_IOCTL(CAPI_GET_MANUFACTURER) |