diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-07-26 15:29:56 -0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2019-08-25 10:10:28 -0400 |
| commit | 33c901020ab3583087ebb40d75f8d45ab93110c1 (patch) | |
| tree | f9f6a671921b26bb158a870ad2c41c53a0e40645 /tools/perf | |
| parent | db361cb406c137c915033ab3c43e313de8fe5eda (diff) | |
| download | linux-stable-33c901020ab3583087ebb40d75f8d45ab93110c1.tar.gz linux-stable-33c901020ab3583087ebb40d75f8d45ab93110c1.tar.bz2 linux-stable-33c901020ab3583087ebb40d75f8d45ab93110c1.zip | |
tools perf beauty: Fix usbdevfs_ioctl table generator to handle _IOC()
[ Upstream commit 7ee526152db7a75d7b8713346dac76ffc3662b29 ]
In addition to _IOW() and _IOR(), to handle this case:
#define USBDEVFS_CONNINFO_EX(len) _IOC(_IOC_READ, 'U', 32, len)
That will happen in the next sync of this header file.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-3br5e4t64e4lp0goo84che3s@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools/perf')
| -rwxr-xr-x | tools/perf/trace/beauty/usbdevfs_ioctl.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/perf/trace/beauty/usbdevfs_ioctl.sh b/tools/perf/trace/beauty/usbdevfs_ioctl.sh index 930b80f422e8..aa597ae53747 100755 --- a/tools/perf/trace/beauty/usbdevfs_ioctl.sh +++ b/tools/perf/trace/beauty/usbdevfs_ioctl.sh @@ -3,10 +3,13 @@ [ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/linux/ +# also as: +# #define USBDEVFS_CONNINFO_EX(len) _IOC(_IOC_READ, 'U', 32, len) + printf "static const char *usbdevfs_ioctl_cmds[] = {\n" -regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)[[:space:]]+_IO[WR]{0,2}\([[:space:]]*'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*" -egrep $regex ${header_dir}/usbdevice_fs.h | egrep -v 'USBDEVFS_\w+32[[:space:]]' | \ - sed -r "s/$regex/\2 \1/g" | \ +regex="^#[[:space:]]*define[[:space:]]+USBDEVFS_(\w+)(\(\w+\))?[[:space:]]+_IO[CWR]{0,2}\([[:space:]]*(_IOC_\w+,[[:space:]]*)?'U'[[:space:]]*,[[:space:]]*([[:digit:]]+).*" +egrep "$regex" ${header_dir}/usbdevice_fs.h | egrep -v 'USBDEVFS_\w+32[[:space:]]' | \ + sed -r "s/$regex/\4 \1/g" | \ sort | xargs printf "\t[%s] = \"%s\",\n" printf "};\n\n" printf "#if 0\n" |