[PATCH] x86_64: remove duplicate COMPATIBLE_IOCTL lines

From: Arnd Bergmann
Date: Fri Jun 11 2004 - 08:13:24 EST


Some of the ioctl numbers in ia32_ioctl are already defined in
include/linux/compat_ioctl.h, so they can be removed here.
Maybe we should have a runtime check for duplicate numbers?

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

===== arch/x86_64/ia32/ia32_ioctl.c 1.41 vs edited =====
--- 1.41/arch/x86_64/ia32/ia32_ioctl.c Sun May 30 21:49:35 2004
+++ edited/arch/x86_64/ia32/ia32_ioctl.c Sat Jun 5 12:14:36 2004
@@ -171,23 +171,8 @@
COMPATIBLE_IOCTL(HDIO_SET_KEEPSETTINGS)
COMPATIBLE_IOCTL(HDIO_SCAN_HWIF)
COMPATIBLE_IOCTL(BLKRASET)
-COMPATIBLE_IOCTL(BLKFRASET)
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(RTC_AIE_ON)
-COMPATIBLE_IOCTL(RTC_AIE_OFF)
-COMPATIBLE_IOCTL(RTC_UIE_ON)
-COMPATIBLE_IOCTL(RTC_UIE_OFF)
-COMPATIBLE_IOCTL(RTC_PIE_ON)
-COMPATIBLE_IOCTL(RTC_PIE_OFF)
-COMPATIBLE_IOCTL(RTC_WIE_ON)
-COMPATIBLE_IOCTL(RTC_WIE_OFF)
-COMPATIBLE_IOCTL(RTC_ALM_SET)
-COMPATIBLE_IOCTL(RTC_ALM_READ)
-COMPATIBLE_IOCTL(RTC_RD_TIME)
-COMPATIBLE_IOCTL(RTC_SET_TIME)
-COMPATIBLE_IOCTL(RTC_WKALM_SET)
-COMPATIBLE_IOCTL(RTC_WKALM_RD)
COMPATIBLE_IOCTL(FIOQSIZE)

/* And these ioctls need translation */

Attachment: pgp00000.pgp
Description: signature