Skip to contentSkip to conversation

tools: Copy the header files needed by perf tools

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 13, 2016

Subsystems (12)
Arm (32-bit) x86 PowerPC MIPS +8 more subsystems
lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  dd7bd1093622621a910cbb6a77c7addeb20c9984
Gitweb:     http://git.kernel.org/tip/dd7bd1093622621a910cbb6a77c7addeb20c9984
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 12 Jul 2016 10:57:25 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 12 Jul 2016 15:20:36 -0300

tools: Copy the header files needed by perf tools

Those kernel files were being directly accessed, which we're not allowing anymore to avoid that changes in the kernel side break tooling.

Warn if these copies drift from the original files.

Cc Adrian Hunter <[email protected]>
Cc Alexander Yarygin <[email protected]>
Cc Christoffer Dall <[email protected]>
Cc David Ahern <[email protected]>
Cc Eric Auger <[email protected]>
Cc Hemant Kumar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Naveen N. Rao <[email protected]>
Cc Srikar Dronamraju <[email protected]>
Cc Wang Nan <[email protected]>
Cc Yunlong Song <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 {arch => tools/arch}/arm/include/uapi/asm/kvm.h    |  0
 {arch => tools/arch}/arm64/include/uapi/asm/kvm.h  |  0
 {arch => tools/arch}/mips/include/uapi/asm/kvm.h   |  0
 .../arch}/powerpc/include/uapi/asm/kvm.h           |  0
 {arch => tools/arch}/s390/include/uapi/asm/kvm.h   |  0
 .../arch}/s390/include/uapi/asm/kvm_perf.h         |  0
 {arch => tools/arch}/s390/include/uapi/asm/sie.h   |  0
 {arch => tools/arch}/x86/include/uapi/asm/kvm.h    |  0
 .../arch}/x86/include/uapi/asm/kvm_perf.h          |  0
 {arch => tools/arch}/x86/include/uapi/asm/svm.h    |  0
 {arch => tools/arch}/x86/include/uapi/asm/vmx.h    |  0
 tools/perf/MANIFEST                                | 15 +++++------
 tools/perf/Makefile.perf                           | 30 ++++++++++++++++++++++
 13 files changed, 36 insertions(+), 9 deletions(-)
tools/arch/arm/include/uapi/asm/kvm.h renamed from arch/arm/include/uapi/asm/kvm.h +0 -0
similarity index 100%
copy from arch/arm/include/uapi/asm/kvm.h
copy to tools/arch/arm/include/uapi/asm/kvm.h
tools/arch/arm64/include/uapi/asm/kvm.h renamed from arch/arm64/include/uapi/asm/kvm.h +0 -0
similarity index 100%
copy from arch/arm64/include/uapi/asm/kvm.h
copy to tools/arch/arm64/include/uapi/asm/kvm.h
tools/arch/mips/include/uapi/asm/kvm.h renamed from arch/mips/include/uapi/asm/kvm.h +0 -0
similarity index 100%
copy from arch/mips/include/uapi/asm/kvm.h
copy to tools/arch/mips/include/uapi/asm/kvm.h
tools/arch/powerpc/include/uapi/asm/kvm.h renamed from arch/powerpc/include/uapi/asm/kvm.h +0 -0
similarity index 100%
copy from arch/powerpc/include/uapi/asm/kvm.h
copy to tools/arch/powerpc/include/uapi/asm/kvm.h
tools/arch/s390/include/uapi/asm/kvm.h renamed from arch/s390/include/uapi/asm/kvm.h +0 -0
similarity index 100%
copy from arch/s390/include/uapi/asm/kvm.h
copy to tools/arch/s390/include/uapi/asm/kvm.h
tools/arch/s390/include/uapi/asm/kvm_perf.h renamed from arch/s390/include/uapi/asm/kvm_perf.h +0 -0
similarity index 100%
copy from arch/s390/include/uapi/asm/kvm_perf.h
copy to tools/arch/s390/include/uapi/asm/kvm_perf.h
tools/arch/s390/include/uapi/asm/sie.h renamed from arch/s390/include/uapi/asm/sie.h +0 -0
similarity index 100%
copy from arch/s390/include/uapi/asm/sie.h
copy to tools/arch/s390/include/uapi/asm/sie.h
tools/arch/x86/include/uapi/asm/kvm.h renamed from arch/x86/include/uapi/asm/kvm.h +0 -0
similarity index 100%
copy from arch/x86/include/uapi/asm/kvm.h
copy to tools/arch/x86/include/uapi/asm/kvm.h
tools/arch/x86/include/uapi/asm/kvm_perf.h renamed from arch/x86/include/uapi/asm/kvm_perf.h +0 -0
similarity index 100%
copy from arch/x86/include/uapi/asm/kvm_perf.h
copy to tools/arch/x86/include/uapi/asm/kvm_perf.h
tools/arch/x86/include/uapi/asm/svm.h renamed from arch/x86/include/uapi/asm/svm.h +0 -0
similarity index 100%
copy from arch/x86/include/uapi/asm/svm.h
copy to tools/arch/x86/include/uapi/asm/svm.h
tools/arch/x86/include/uapi/asm/vmx.h renamed from arch/x86/include/uapi/asm/vmx.h +0 -0
similarity index 100%
copy from arch/x86/include/uapi/asm/vmx.h
copy to tools/arch/x86/include/uapi/asm/vmx.h
tools/perf/MANIFEST +6 -9
index a4aefae..db7cfb4 100644
@@ -15,8 +15,14 @@ tools/arch/x86/include/asm/barrier.h
 tools/arch/x86/include/asm/cpufeatures.h
 tools/arch/x86/include/asm/disabled-features.h
 tools/arch/x86/include/asm/required-features.h
+tools/arch/x86/include/uapi/asm/svm.h
+tools/arch/x86/include/uapi/asm/vmx.h
+tools/arch/x86/include/uapi/asm/kvm.h
+tools/arch/x86/include/uapi/asm/kvm_perf.h
 tools/arch/x86/lib/memcpy_64.S
 tools/arch/x86/lib/memset_64.S
+tools/arch/s390/include/uapi/asm/kvm_perf.h
+tools/arch/s390/include/uapi/asm/sie.h
 tools/arch/xtensa/include/asm/barrier.h
 tools/scripts
 tools/build

@@ -85,12 +91,3 @@ tools/arch/*/include/uapi/asm/perf_regs.h
 include/linux/poison.h
 include/uapi/linux/const.h
 include/uapi/linux/swab.h
-arch/x86/include/asm/svm.h
-arch/x86/include/asm/vmx.h
-arch/x86/include/asm/kvm_host.h
-arch/x86/include/uapi/asm/svm.h
-arch/x86/include/uapi/asm/vmx.h
-arch/x86/include/uapi/asm/kvm.h
-arch/x86/include/uapi/asm/kvm_perf.h
-arch/s390/include/uapi/asm/sie.h
-arch/s390/include/uapi/asm/kvm_perf.h
tools/perf/Makefile.perf +30 -0
index 0d07672..feb2c66 100644
@@ -378,6 +378,36 @@ $(PERF_IN): prepare FORCE
 	@(test -f ../../arch/x86/include/uapi/asm/perf_regs.h && ( \
         (diff -B ../arch/x86/include/uapi/asm/perf_regs.h ../../arch/x86/include/uapi/asm/perf_regs.h >/dev/null) \
         || echo "Warning: tools/arch/x86/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/x86/include/uapi/asm/kvm.h && ( \
+        (diff -B ../arch/x86/include/uapi/asm/kvm.h ../../arch/x86/include/uapi/asm/kvm.h >/dev/null) \
+        || echo "Warning: tools/arch/x86/include/uapi/asm/kvm.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/x86/include/uapi/asm/kvm_perf.h && ( \
+        (diff -B ../arch/x86/include/uapi/asm/kvm_perf.h ../../arch/x86/include/uapi/asm/kvm_perf.h >/dev/null) \
+        || echo "Warning: tools/arch/x86/include/uapi/asm/kvm_perf.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/x86/include/uapi/asm/svm.h && ( \
+        (diff -B ../arch/x86/include/uapi/asm/svm.h ../../arch/x86/include/uapi/asm/svm.h >/dev/null) \
+        || echo "Warning: tools/arch/x86/include/uapi/asm/svm.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/x86/include/uapi/asm/vmx.h && ( \
+        (diff -B ../arch/x86/include/uapi/asm/vmx.h ../../arch/x86/include/uapi/asm/vmx.h >/dev/null) \
+        || echo "Warning: tools/arch/x86/include/uapi/asm/vmx.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/powerpc/include/uapi/asm/kvm.h && ( \
+        (diff -B ../arch/powerpc/include/uapi/asm/kvm.h ../../arch/powerpc/include/uapi/asm/kvm.h >/dev/null) \
+        || echo "Warning: tools/arch/powerpc/include/uapi/asm/kvm.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/s390/include/uapi/asm/kvm.h && ( \
+        (diff -B ../arch/s390/include/uapi/asm/kvm.h ../../arch/s390/include/uapi/asm/kvm.h >/dev/null) \
+        || echo "Warning: tools/arch/s390/include/uapi/asm/kvm.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/s390/include/uapi/asm/kvm_perf.h && ( \
+        (diff -B ../arch/s390/include/uapi/asm/kvm_perf.h ../../arch/s390/include/uapi/asm/kvm_perf.h >/dev/null) \
+        || echo "Warning: tools/arch/s390/include/uapi/asm/kvm_perf.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/s390/include/uapi/asm/sie.h && ( \
+        (diff -B ../arch/s390/include/uapi/asm/sie.h ../../arch/s390/include/uapi/asm/sie.h >/dev/null) \
+        || echo "Warning: tools/arch/s390/include/uapi/asm/sie.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/arm/include/uapi/asm/kvm.h && ( \
+        (diff -B ../arch/arm/include/uapi/asm/kvm.h ../../arch/arm/include/uapi/asm/kvm.h >/dev/null) \
+        || echo "Warning: tools/arch/arm/include/uapi/asm/kvm.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/arm64/include/uapi/asm/kvm.h && ( \
+        (diff -B ../arch/arm64/include/uapi/asm/kvm.h ../../arch/arm64/include/uapi/asm/kvm.h >/dev/null) \
+        || echo "Warning: tools/arch/arm64/include/uapi/asm/kvm.h differs from kernel" >&2 )) || true
 	$(Q)$(MAKE) $(build)=perf
 
 $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)