tools uapi asm-generic: Synchronize ioctls.h
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 83d9bdeaedd8f7aa9749828364f0018cacd1dad3 Gitweb: https://git.kernel.org/tip/83d9bdeaedd8f7aa9749828364f0018cacd1dad3 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 19 Nov 2018 12:31:45 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 19 Nov 2018 12:31:45 -0800
tools uapi asm-generic: Synchronize ioctls.h
To pick up the changes in:
ad8c0eaa0a41 ("tty/serial_core: add ISO7816 infrastructure")
That is a change that imply a change to be made in tools/perf/trace/beauty/ioctl.c to make 'perf trace' ioctl syscall argument beautifier to support these new
commands: TIOCGISO7816 and TIOCSISO7816.
This is not yet done automatically by a script like is done for some other headers, for instance:
$ tools/perf/trace/beauty/drm_ioctl.sh | head
#ifndef DRM_COMMAND_BASE
#define DRM_COMMAND_BASE 0x40
#endif
static const char *drm_ioctl_cmds[] = {
[0x00] = "VERSION",
[0x01] = "GET_UNIQUE",
[0x02] = "GET_MAGIC",
[0x03] = "IRQ_BUSID",
[0x04] = "GET_MAP",
[0x05] = "GET_CLIENT",
$So we will need to change tools/perf/trace/beauty/ioctl.c in a follow up patch until we switch to a generator script.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/include/uapi/asm-generic/ioctls.h | 2 ++ 1 file changed, 2 insertions(+)
tools/include/uapi/asm-generic/ioctls.h +2 -0
@@ -79,6 +79,8 @@#define TIOCGPTLCK _IOR('T', 0x39, int)/* Get Pty lock state */ #define TIOCGEXCL _IOR('T', 0x40, int)/* Get exclusive mode state */ #define TIOCGPTPEER _IO('T', 0x41)/* Safely open the slave */ +#define TIOCGISO7816 _IOR('T', 0x42, struct serial_iso7816) +#define TIOCSISO7816 _IOWR('T', 0x43, struct serial_iso7816)#define FIONCLEX 0x5450#define FIOCLEX 0x5451