Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

compat_ioctl: Avoid using undefined RS-485 IOCTLs

Wrap the use of TIOCSRS485 and TIOCGRS485 in #ifdef so that we avoid
adding undefined IOCTLs to the ioctl pointer list as compatible
ioctls.

This change was motivated by a build error on a MIPS build.

tree:   git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
tty-next
head:   ac57e7f38ea6fe7358cd0b7a2f2d21aef5ab70cd
commit: 84c3b84860440a9e3a3666c14112f41311b8f623 [10/16] compat_ioctl:
  Add RS-485 IOCTLs to the list
config: mips-fuloong2e_defconfig

All related error/warning messages:

fs/compat_ioctl.c:869:1: error: 'TIOCSRS485' undeclared here (not in a
  function)
fs/compat_ioctl.c:870:1: error: 'TIOCGRS485' undeclared here (not in a
  function)

vim +869 fs/compat_ioctl.c
863 COMPATIBLE_IOCTL(TIOCSPGRP)
864 COMPATIBLE_IOCTL(TIOCGPGRP)
865 COMPATIBLE_IOCTL(TIOCGPTN)
866 COMPATIBLE_IOCTL(TIOCSPTLCK)
867 COMPATIBLE_IOCTL(TIOCSERGETLSR)
868 COMPATIBLE_IOCTL(TIOCSIG)
> 869 COMPATIBLE_IOCTL(TIOCSRS485)
870 COMPATIBLE_IOCTL(TIOCGRS485)
871 #ifdef TCGETS2
872 COMPATIBLE_IOCTL(TCGETS2)

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jaeden Amero <jaeden.amero@ni.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Jaeden Amero 12 years ago
parent
ac57e7f38e
commit
142e5460a6
1 changed files with 4 additions and 0 deletions
Split View Show Diff Stats
  1. 4 0
      fs/compat_ioctl.c

+ 4 - 0
fs/compat_ioctl.c
View File 

@@ -866,8 +866,12 @@ COMPATIBLE_IOCTL(TIOCGPTN)
 
 COMPATIBLE_IOCTL(TIOCSPTLCK)
 
 COMPATIBLE_IOCTL(TIOCSERGETLSR)
 
 COMPATIBLE_IOCTL(TIOCSIG)
 
+#ifdef TIOCSRS485
 
 COMPATIBLE_IOCTL(TIOCSRS485)
 
+#endif
 
+#ifdef TIOCGRS485
 
 COMPATIBLE_IOCTL(TIOCGRS485)
 
+#endif
 
 #ifdef TCGETS2
 
 COMPATIBLE_IOCTL(TCGETS2)
 
 COMPATIBLE_IOCTL(TCSETS2)