aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaeden Amero <jaeden.amero@ni.com>2012-09-19 10:34:31 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-21 12:51:09 -0400
commit84c3b84860440a9e3a3666c14112f41311b8f623 (patch)
treed9d9eab973ac8de9f440a4ea4e6a3dc6b4afd7bd
parent7b6d45c211a401a9bdeebfa96f8a4c811bd3eeaf (diff)
compat_ioctl: Add RS-485 IOCTLs to the list
The RS-485 TIOCSRS485 and TIOCGRS485 ioctls are 32-bit compatible, so in order to call them on 64-bit systems from 32-bit user mode, we add them to the ioctl pointer list as compatible ioctls. Signed-off-by: Jaeden Amero <jaeden.amero@ni.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/compat_ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index debdfe0fc809..85dfebfe6820 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -866,6 +866,8 @@ COMPATIBLE_IOCTL(TIOCGPTN)
866COMPATIBLE_IOCTL(TIOCSPTLCK) 866COMPATIBLE_IOCTL(TIOCSPTLCK)
867COMPATIBLE_IOCTL(TIOCSERGETLSR) 867COMPATIBLE_IOCTL(TIOCSERGETLSR)
868COMPATIBLE_IOCTL(TIOCSIG) 868COMPATIBLE_IOCTL(TIOCSIG)
869COMPATIBLE_IOCTL(TIOCSRS485)
870COMPATIBLE_IOCTL(TIOCGRS485)
869#ifdef TCGETS2 871#ifdef TCGETS2
870COMPATIBLE_IOCTL(TCGETS2) 872COMPATIBLE_IOCTL(TCGETS2)
871COMPATIBLE_IOCTL(TCSETS2) 873COMPATIBLE_IOCTL(TCSETS2)