summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 07:37:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 07:37:20 -0800
commitbdeef61cd053b6a88be7d2c82fd43e12f8c9f75e (patch)
tree6980d178f5402260dfc3c35840b95dc5584cf85e /fs
parent4caca5f917ce991dc67fbb42fa82a1f044538e23 (diff)
parent703625118069f9f8960d356676662d3db5a9d116 (diff)
downloadop-kernel-dev-bdeef61cd053b6a88be7d2c82fd43e12f8c9f75e.zip
op-kernel-dev-bdeef61cd053b6a88be7d2c82fd43e12f8c9f75e.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty: fix race in tty_fasync serial: serial_cs: oxsemi quirk breaks resume serial: imx: bit &/| confusion serial: Fix crash if the minimum rate of the device is > 9600 baud serial-core: resume serial hardware with no_console_suspend serial: 8250_pnp: use wildcard for serial Wacom tablets nozomi: quick fix for the close/close bug compat_ioctl: Supress "unknown cmd" message on serial /dev/console
Diffstat (limited to 'fs')
-rw-r--r--fs/compat_ioctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 332dd00..c5c45de 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1005,6 +1005,9 @@ COMPATIBLE_IOCTL(SCSI_IOCTL_SEND_COMMAND)
COMPATIBLE_IOCTL(SCSI_IOCTL_PROBE_HOST)
COMPATIBLE_IOCTL(SCSI_IOCTL_GET_PCI)
#endif
+/* Big V (don't complain on serial console) */
+IGNORE_IOCTL(VT_OPENQRY)
+IGNORE_IOCTL(VT_GETMODE)
/* Little p (/dev/rtc, /dev/envctrl, etc.) */
COMPATIBLE_IOCTL(RTC_AIE_ON)
COMPATIBLE_IOCTL(RTC_AIE_OFF)
OpenPOWER on IntegriCloud