[Devel] [PATCH RHEL7 COMMIT] ms/ppc: define TIOSAK (fix tty_ioctl() compilation)

Konstantin Khorenko khorenko at odin.com
Thu May 7 09:28:16 PDT 2015


The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.4.10
------>
commit 7777b8461956ba8785caa41580809f9c31224f54
Author: Kir Kolyshkin <kir at openvz.org>
Date:   Thu May 7 20:28:16 2015 +0400

    ms/ppc: define TIOSAK (fix tty_ioctl() compilation)
    
    This was found while tring to compile the kernel with a stock
    config (i.e. no CONFIG_BEANCOUNTERS, CONFIG_VE etc.) and
    boot it on IBM Power8.
    
    =============================================================
    
    Fix the following error:
    
      CC      drivers/tty/tty_io.o
    drivers/tty/tty_io.c: In function ‘tty_ioctl’:
    drivers/tty/tty_io.c:2843:7: error: ‘TIOSAK’ undeclared (first use in
    this function)
      case TIOSAK:
    
    This is an addition to commit 28f8dfa.
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 arch/powerpc/include/uapi/asm/ioctls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/include/uapi/asm/ioctls.h b/arch/powerpc/include/uapi/asm/ioctls.h
index 49a2579..8cc89fa 100644
--- a/arch/powerpc/include/uapi/asm/ioctls.h
+++ b/arch/powerpc/include/uapi/asm/ioctls.h
@@ -116,4 +116,6 @@
 #define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */
 #define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */
 
+#define TIOSAK		_IO('T', 0x66)	/* "Secure Attention Key" */
+
 #endif	/* _ASM_POWERPC_IOCTLS_H */



More information about the Devel mailing list