Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b05a581d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] move some COMPATIBLE_IOCTL entries from x86_64 to common code 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7e4c54a2

arch/x86_64/ia32/ia32_ioctl.c

+0 −6
Original line number Diff line number Diff line
@@ -64,12 +64,6 @@ struct ioctl_trans ioctl_start[] = { 
#include <linux/compat_ioctl.h>

#define DECLARES

#include "compat_ioctl.c"

COMPATIBLE_IOCTL(HDIO_SET_KEEPSETTINGS)

COMPATIBLE_IOCTL(HDIO_SCAN_HWIF)

COMPATIBLE_IOCTL(BLKRASET)

COMPATIBLE_IOCTL(0x4B50)   /* KDGHWCLK - not in the kernel, but don't complain */

COMPATIBLE_IOCTL(0x4B51)   /* KDSHWCLK - not in the kernel, but don't complain */

COMPATIBLE_IOCTL(FIOQSIZE)



/* And these ioctls need translation */

/* realtime device */

include/linux/compat_ioctl.h

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 
#define ULONG_IOCTL(cmd)  HANDLE_IOCTL((cmd),(ioctl_trans_handler_t)sys_ioctl)

#endif





COMPATIBLE_IOCTL(0x4B50)   /* KDGHWCLK - not in the kernel, but don't complain */

COMPATIBLE_IOCTL(0x4B51)   /* KDSHWCLK - not in the kernel, but don't complain */



/* Big T */

COMPATIBLE_IOCTL(TCGETA)

COMPATIBLE_IOCTL(TCSETA)
@@ -81,6 +85,8 @@ COMPATIBLE_IOCTL(HDIO_DRIVE_CMD) 
COMPATIBLE_IOCTL(HDIO_DRIVE_TASK)

COMPATIBLE_IOCTL(HDIO_SET_PIO_MODE)

COMPATIBLE_IOCTL(HDIO_SET_NICE)

COMPATIBLE_IOCTL(HDIO_SET_KEEPSETTINGS)

COMPATIBLE_IOCTL(HDIO_SCAN_HWIF)

/* 0x02 -- Floppy ioctls */

COMPATIBLE_IOCTL(FDMSGON)

COMPATIBLE_IOCTL(FDMSGOFF)
@@ -99,6 +105,7 @@ COMPATIBLE_IOCTL(FDTWADDLE) 
COMPATIBLE_IOCTL(FDFMTTRK)

COMPATIBLE_IOCTL(FDRAWCMD)

/* 0x12 */

COMPATIBLE_IOCTL(BLKRASET)

COMPATIBLE_IOCTL(BLKROSET)

COMPATIBLE_IOCTL(BLKROGET)

COMPATIBLE_IOCTL(BLKRRPART)
@@ -262,6 +269,7 @@ COMPATIBLE_IOCTL(RTC_WKALM_RD) 
/* Little m */

COMPATIBLE_IOCTL(MTIOCTOP)

/* Socket level stuff */

COMPATIBLE_IOCTL(FIOQSIZE)

COMPATIBLE_IOCTL(FIOSETOWN)

COMPATIBLE_IOCTL(SIOCSPGRP)

COMPATIBLE_IOCTL(FIOGETOWN)