x86_64: remove duplicate COMPATIBLE_IOCTL lines
PATCH 1/1 x86_64: remove duplicate COMPATIBLE_IOCTL lines
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 <[email protected]>
===== arch/x86_64/ia32/ia32_ioctl.c 1.41 vs edited =====
arch/x86_64/ia32/ia32_ioctl.c +0 -15
@@ -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 */
Quoted 5 lines · On Fri, 11 Jun 2004 15:10:37 +0200 Arnd Bergmann <[email protected]> wrote:
Some of the ioctl numbers in
ia32_ioctlare already defined ininclude/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 <[email protected]>
Thanks. Your patch was corrupted somehow, but I applied it by hand.
-Andi