Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] sh/sh64: Fix bogus TIOCGICOUNT definitions

As reported by Russell King, sh and sh64 currently have bogus definitions for
TIOCGICOUNT, particularly referencing a kernel only structure. Switch to
using a sensible ioctl value.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Paul Mundt and committed by
Linus Torvalds
87f55e67 a3310bbd

+2 -2
+1 -1
include/asm-sh/ioctls.h
··· 94 94 #define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct) /* 0x545B */ /* Set multiport config */ 95 95 96 96 #define TIOCMIWAIT _IO('T', 92) /* 0x545C */ /* wait for a change on serial input line(s) */ 97 - #define TIOCGICOUNT _IOR('T', 93, struct async_icount) /* 0x545D */ /* read serial port inline interrupt counts */ 97 + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ 98 98 99 99 #endif /* __ASM_SH_IOCTLS_H */
+1 -1
include/asm-sh64/ioctls.h
··· 111 111 #define TIOCSERSETMULTI 0x40a8545b /* _IOW('T', 91, struct serial_multiport_struct) 0x545B */ /* Set multiport config */ 112 112 113 113 #define TIOCMIWAIT 0x545c /* _IO('T', 92) wait for a change on serial input line(s) */ 114 - #define TIOCGICOUNT 0x802c545d /* _IOR('T', 93, struct async_icount) 0x545D */ /* read serial port inline interrupt counts */ 114 + #define TIOCGICOUNT 0x545d /* read serial port inline interrupt counts */ 115 115 116 116 #endif /* __ASM_SH64_IOCTLS_H */