tools: Move tools/include/uapi/drm to tools/perf/trace/beauty/include/uapi
Arnaldo Carvalho de Melo
maintainerPATCH 1/1 tools: Move tools/include/uapi/drm to tools/perf/trace/beauty/include/uapi
As it is used only to parse ioctl numbers, not to build perf and so far no other tools/ living tools uses it, so to clean up tools/include/ to be used just for building tools, to have access to things available in the kernel and not yet in the system headers, move it to the directory where just the tools/perf/trace/beauty/ scripts can use to generate tables used by perf.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/Makefile.perf | 2 +-
tools/perf/check-headers.sh | 4 ++--
tools/perf/trace/beauty/drm_ioctl.sh | 2 +-
tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h | 0
tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename tools/{ => perf/trace/beauty}/include/uapi/drm/drm.h (100%)
rename tools/{ => perf/trace/beauty}/include/uapi/drm/i915_drm.h (100%)tools/perf/Makefile.perf +1 -1
@@ -547,7 +547,7 @@ $(clone_flags_array): $(beauty_uapi_linux_dir)/sched.h $(clone_flags_tbl) $(Q)$(SHELL) '$(clone_flags_tbl)' $(beauty_uapi_linux_dir) > $@ drm_ioctl_array := $(beauty_ioctl_outdir)/drm_ioctl_array.c -drm_hdr_dir := $(srctree)/tools/include/uapi/drm +drm_hdr_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/drm drm_ioctl_tbl := $(srctree)/tools/perf/trace/beauty/drm_ioctl.sh $(drm_ioctl_array): $(drm_hdr_dir)/drm.h $(drm_hdr_dir)/i915_drm.h $(drm_ioctl_tbl)
tools/perf/check-headers.sh +2 -2
@@ -6,8 +6,6 @@ NC='\033[0m' # No Color declare -a FILES=( "include/uapi/linux/const.h" - "include/uapi/drm/drm.h" - "include/uapi/drm/i915_drm.h" "include/uapi/linux/bits.h" "include/uapi/linux/fadvise.h" "include/uapi/linux/fscrypt.h"
@@ -90,6 +88,8 @@ declare -a SYNC_CHECK_FILES=( declare -a BEAUTY_FILES=( "arch/x86/include/asm/irq_vectors.h" "arch/x86/include/uapi/asm/prctl.h" + "include/uapi/drm/drm.h" + "include/uapi/drm/i915_drm.h" "include/linux/socket.h" "include/uapi/linux/fcntl.h" "include/uapi/linux/fs.h"
tools/perf/trace/beauty/drm_ioctl.sh +1 -1
@@ -1,7 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: LGPL-2.1 -[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/drm/ +[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/perf/trace/beauty/include/uapi/drm/ printf "#ifndef DRM_COMMAND_BASE\n" grep "#define DRM_COMMAND_BASE" $header_dir/drm.h
tools/perf/trace/beauty/include/uapi/drm/drm.h renamed from tools/include/uapi/drm/drm.h +0 -0
tools/perf/trace/beauty/include/uapi/drm/i915_drm.h renamed from tools/include/uapi/drm/i915_drm.h +0 -0
Signature · 1 line
2.53.0