From a011bafb1cf2c1c2d5d8fbf9f7b84da927e3e304 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Sun, 30 Oct 2005 15:01:41 -0800
Subject: [PATCH] --- yaml --- r: 11807 b: refs/heads/master c:
 9c0cbd54ce0397017a823484f9a8054ab369b8a2 h: refs/heads/master i:   11805:
 ca46e7aa563c6a98ab1e33888e0f3ccbe4e3a799   11803:
 4a88212df9bdfbf6c6d3719307528a50f46bdb66   11799:
 fb2f6fe9af2d90eeed0d9ce723b7aeff3f8db5cf   11791:
 555b1bc497897ed09a74e7e1484912765fc523b6   11775:
 5a178a5e1e83abed4c9796e501845805e8d1d1f4 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/parisc/kernel/ioctl32.c  | 5 -----
 trunk/arch/ppc64/kernel/ioctl32.c   | 4 +---
 trunk/arch/sparc64/kernel/ioctl32.c | 3 ---
 trunk/fs/compat_ioctl.c             | 4 ++++
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index b7668720b13f..69fd090f730e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61e1a9ea4b425eb8c3b4965c35fe953bd881728f
+refs/heads/master: 9c0cbd54ce0397017a823484f9a8054ab369b8a2
diff --git a/trunk/arch/parisc/kernel/ioctl32.c b/trunk/arch/parisc/kernel/ioctl32.c
index 8cad8f004f00..0a331104ad56 100644
--- a/trunk/arch/parisc/kernel/ioctl32.c
+++ b/trunk/arch/parisc/kernel/ioctl32.c
@@ -561,11 +561,6 @@ IOCTL_TABLE_START
 #define DECLARES
 #include "compat_ioctl.c"
 
-/* Might be moved to compat_ioctl.h with some ifdefs... */
-COMPATIBLE_IOCTL(TIOCSTART)
-COMPATIBLE_IOCTL(TIOCSTOP)
-COMPATIBLE_IOCTL(TIOCSLTC)
-
 /* PA-specific ioctls */
 COMPATIBLE_IOCTL(PA_PERF_ON)
 COMPATIBLE_IOCTL(PA_PERF_OFF)
diff --git a/trunk/arch/ppc64/kernel/ioctl32.c b/trunk/arch/ppc64/kernel/ioctl32.c
index a8005db23ec5..ba4a899045c2 100644
--- a/trunk/arch/ppc64/kernel/ioctl32.c
+++ b/trunk/arch/ppc64/kernel/ioctl32.c
@@ -39,9 +39,7 @@ IOCTL_TABLE_START
 #include <linux/compat_ioctl.h>
 #define DECLARES
 #include "compat_ioctl.c"
-COMPATIBLE_IOCTL(TIOCSTART)
-COMPATIBLE_IOCTL(TIOCSTOP)
-COMPATIBLE_IOCTL(TIOCSLTC)
+
 /* Little p (/dev/rtc, /dev/envctrl, etc.) */
 COMPATIBLE_IOCTL(_IOR('p', 20, int[7])) /* RTCGET */
 COMPATIBLE_IOCTL(_IOW('p', 21, int[7])) /* RTCSET */
diff --git a/trunk/arch/sparc64/kernel/ioctl32.c b/trunk/arch/sparc64/kernel/ioctl32.c
index 43fc3173d480..e6a00325075a 100644
--- a/trunk/arch/sparc64/kernel/ioctl32.c
+++ b/trunk/arch/sparc64/kernel/ioctl32.c
@@ -475,9 +475,6 @@ IOCTL_TABLE_START
 #include <linux/compat_ioctl.h>
 #define DECLARES
 #include "compat_ioctl.c"
-COMPATIBLE_IOCTL(TIOCSTART)
-COMPATIBLE_IOCTL(TIOCSTOP)
-COMPATIBLE_IOCTL(TIOCSLTC)
 COMPATIBLE_IOCTL(FBIOGTYPE)
 COMPATIBLE_IOCTL(FBIOSATTR)
 COMPATIBLE_IOCTL(FBIOGATTR)
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index a327e03753ac..43dbcb0b21eb 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -3046,6 +3046,10 @@ HANDLE_IOCTL(RAW_GETBIND, raw_ioctl)
 /* Serial */
 HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl)
 HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl)
+#ifdef TIOCGLTC
+COMPATIBLE_IOCTL(TIOCGLTC)
+COMPATIBLE_IOCTL(TIOCSLTC)
+#endif
 /* Usbdevfs */
 HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control)
 HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk)