Author: glen Date: Tue Nov 6 01:51:08 2007 GMT
Module: SOURCES Tag: LINUX_2_6_16
---- Log message:
- update from suse kernel-source-2.6.18.2-34.src.rpm
---- Files affected:
SOURCES:
kernel-TIOCGDEV.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/kernel-TIOCGDEV.patch
diff -u SOURCES/kernel-TIOCGDEV.patch:1.1 SOURCES/kernel-TIOCGDEV.patch:1.1.2.1
--- SOURCES/kernel-TIOCGDEV.patch:1.1 Thu Nov 1 15:06:34 2007
+++ SOURCES/kernel-TIOCGDEV.patch Tue Nov 6 02:51:03 2007
@@ -5,7 +5,6 @@
add tty ioctl to figure physical device of the console.
drivers/char/tty_io.c | 15 +++++++++++++++
- fs/compat_ioctl.c | 1 +
include/asm-alpha/ioctls.h | 1 +
include/asm-arm/ioctls.h | 1 +
include/asm-i386/ioctls.h | 1 +
@@ -18,14 +17,16 @@
include/asm-sparc/ioctls.h | 1 +
include/asm-sparc64/ioctls.h | 1 +
include/asm-x86_64/ioctls.h | 1 +
+ include/linux/compat_ioctl.h | 1 +
14 files changed, 28 insertions(+)
---- a/drivers/char/tty_io.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/drivers/char/tty_io.c 2007-08-27 14:02:21.000000000 -0400
-@@ -3354,6 +3354,21 @@ int tty_ioctl(struct inode * inode, stru
- return tioclinux(tty, arg);
- #endif
- /*
+--- linux-2.6.18.orig/drivers/char/tty_io.c
++++ linux-2.6.18/drivers/char/tty_io.c
+@@ -3265,6 +3265,21 @@ int tty_ioctl(struct inode * inode, stru
+ case TIOCMBIC:
+ case TIOCMBIS:
+ return tty_tiocmset(tty, file, cmd, p);
++ /*
+ * Without the real device to which /dev/console is connected,
+ * blogd can not work.
+ * blogd spawns a pty/tty pair,
@@ -40,22 +41,11 @@
+ return put_user(ret, (unsigned int __user *)p);
+ }
+
-+ /*
- * Break handling
- */
- case TIOCSBRK: /* Turn break on, unconditionally */
---- a/fs/compat_ioctl.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/fs/compat_ioctl.c 2007-08-27 14:01:21.000000000 -0400
-@@ -2451,6 +2451,7 @@ COMPATIBLE_IOCTL(TCSETSW)
- COMPATIBLE_IOCTL(TCSETSF)
- COMPATIBLE_IOCTL(TIOCLINUX)
- COMPATIBLE_IOCTL(TIOCSBRK)
-+COMPATIBLE_IOCTL(TIOCGDEV)
- COMPATIBLE_IOCTL(TIOCCBRK)
- ULONG_IOCTL(TIOCMIWAIT)
- COMPATIBLE_IOCTL(TIOCGICOUNT)
---- a/include/asm-alpha/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-alpha/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+ }
+ if (tty->driver->ioctl) {
+ retval = (tty->driver->ioctl)(tty, file, cmd, arg);
+--- linux-2.6.18.orig/include/asm-alpha/ioctls.h
++++ linux-2.6.18/include/asm-alpha/ioctls.h
@@ -91,6 +91,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
@@ -64,28 +54,28 @@
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
---- a/include/asm-arm/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-arm/ioctls.h 2007-08-27 14:01:21.000000000 -0400
-@@ -52,6 +52,7 @@
- #define TCSETSF2 _IOW('T',0x2D, struct termios2)
+--- linux-2.6.18.orig/include/asm-arm/ioctls.h
++++ linux-2.6.18/include/asm-arm/ioctls.h
+@@ -48,6 +48,7 @@
+ #define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below
/dev/console */
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
---- a/include/asm-i386/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-i386/ioctls.h 2007-08-27 14:01:21.000000000 -0400
-@@ -53,6 +53,7 @@
- #define TCSETSF2 _IOW('T',0x2D, struct termios2)
+--- linux-2.6.18.orig/include/asm-i386/ioctls.h
++++ linux-2.6.18/include/asm-i386/ioctls.h
+@@ -49,6 +49,7 @@
+ #define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below
/dev/console */
#define FIONCLEX 0x5450
#define FIOCLEX 0x5451
---- a/include/asm-ia64/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-ia64/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-ia64/ioctls.h
++++ linux-2.6.18/include/asm-ia64/ioctls.h
@@ -55,6 +55,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
@@ -94,8 +84,8 @@
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
---- a/include/asm-m68k/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-m68k/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-m68k/ioctls.h
++++ linux-2.6.18/include/asm-m68k/ioctls.h
@@ -48,6 +48,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
@@ -104,8 +94,8 @@
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
---- a/include/asm-mips/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-mips/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-mips/ioctls.h
++++ linux-2.6.18/include/asm-mips/ioctls.h
@@ -79,6 +79,7 @@
#define TIOCGSID 0x7416 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
@@ -114,8 +104,8 @@
/* I hope the range from 0x5480 on is free ... */
#define TIOCSCTTY 0x5480 /* become controlling tty */
---- a/include/asm-powerpc/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-powerpc/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-powerpc/ioctls.h
++++ linux-2.6.18/include/asm-powerpc/ioctls.h
@@ -91,6 +91,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
@@ -124,8 +114,8 @@
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
---- a/include/asm-s390/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-s390/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-s390/ioctls.h
++++ linux-2.6.18/include/asm-s390/ioctls.h
@@ -56,6 +56,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
@@ -134,8 +124,8 @@
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
---- a/include/asm-sh/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-sh/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-sh/ioctls.h
++++ linux-2.6.18/include/asm-sh/ioctls.h
@@ -80,6 +80,7 @@
#define TIOCGSID _IOR('T', 41, pid_t) /* 0x5429 */ /* Return the session
ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
@@ -144,8 +134,8 @@
#define TIOCSERCONFIG _IO('T', 83) /* 0x5453 */
#define TIOCSERGWILD _IOR('T', 84, int) /* 0x5454 */
---- a/include/asm-sparc/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-sparc/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-sparc/ioctls.h
++++ linux-2.6.18/include/asm-sparc/ioctls.h
@@ -15,6 +15,7 @@
#define TCSETS _IOW('T', 9, struct termios)
#define TCSETSW _IOW('T', 10, struct termios)
@@ -154,8 +144,8 @@
/* Note that all the ioctls that are not available in Linux have a
* double underscore on the front to: a) avoid some programs to
---- a/include/asm-sparc64/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-sparc64/ioctls.h 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.18.orig/include/asm-sparc64/ioctls.h
++++ linux-2.6.18/include/asm-sparc64/ioctls.h
@@ -16,6 +16,7 @@
#define TCSETS _IOW('T', 9, struct termios)
#define TCSETSW _IOW('T', 10, struct termios)
@@ -164,13 +154,23 @@
/* Note that all the ioctls that are not available in Linux have a
* double underscore on the front to: a) avoid some programs to
---- a/include/asm-x86_64/ioctls.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-x86_64/ioctls.h 2007-08-27 14:01:21.000000000 -0400
-@@ -52,6 +52,7 @@
- #define TCSETSF2 _IOW('T',0x2D, struct termios2)
+--- linux-2.6.18.orig/include/asm-x86_64/ioctls.h
++++ linux-2.6.18/include/asm-x86_64/ioctls.h
+@@ -48,6 +48,7 @@
+ #define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of
pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below
/dev/console */
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
+--- linux-2.6.18.orig/include/linux/compat_ioctl.h
++++ linux-2.6.18/include/linux/compat_ioctl.h
+@@ -21,6 +21,7 @@ COMPATIBLE_IOCTL(TCSETSW)
+ COMPATIBLE_IOCTL(TCSETSF)
+ COMPATIBLE_IOCTL(TIOCLINUX)
+ COMPATIBLE_IOCTL(TIOCSBRK)
++COMPATIBLE_IOCTL(TIOCGDEV)
+ COMPATIBLE_IOCTL(TIOCCBRK)
+ ULONG_IOCTL(TIOCMIWAIT)
+ COMPATIBLE_IOCTL(TIOCGICOUNT)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-TIOCGDEV.patch?r1=1.1&r2=1.1.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
