From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752355AbcGMHUE (ORCPT ); Wed, 13 Jul 2016 03:20:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41636 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751680AbcGMHT6 (ORCPT ); Wed, 13 Jul 2016 03:19:58 -0400 Date: Wed, 13 Jul 2016 00:19:43 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org, namhyung@kernel.org, srikar@linux.vnet.ibm.com, dsahern@gmail.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, yunlong.song@huawei.com, christoffer.dall@linaro.org, wangnan0@huawei.com, eric.auger@linaro.org, hemant@linux.vnet.ibm.com, marc.zyngier@arm.com, adrian.hunter@intel.com, naveen.n.rao@linux.vnet.ibm.com, acme@redhat.com, yarygin@linux.vnet.ibm.com Reply-To: marc.zyngier@arm.com, adrian.hunter@intel.com, acme@redhat.com, naveen.n.rao@linux.vnet.ibm.com, yarygin@linux.vnet.ibm.com, hemant@linux.vnet.ibm.com, christoffer.dall@linaro.org, yunlong.song@huawei.com, wangnan0@huawei.com, eric.auger@linaro.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, srikar@linux.vnet.ibm.com, tglx@linutronix.de, dsahern@gmail.com, hpa@zytor.com, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Copy the header files needed by perf tools Git-Commit-ID: dd7bd1093622621a910cbb6a77c7addeb20c9984 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dd7bd1093622621a910cbb6a77c7addeb20c9984 Gitweb: http://git.kernel.org/tip/dd7bd1093622621a910cbb6a77c7addeb20c9984 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 12 Jul 2016 10:57:25 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Alexander Yarygin Cc: Christoffer Dall Cc: David Ahern Cc: Eric Auger Cc: Hemant Kumar Cc: Jiri Olsa Cc: Marc Zyngier Cc: Namhyung Kim Cc: Naveen N. Rao Cc: Srikar Dronamraju Cc: Wang Nan Cc: Yunlong Song Link: http://lkml.kernel.org/n/tip-mnopguymhnwzjhw3mowllvsy@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- {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(-) diff --git a/arch/arm/include/uapi/asm/kvm.h b/tools/arch/arm/include/uapi/asm/kvm.h similarity index 100% copy from arch/arm/include/uapi/asm/kvm.h copy to tools/arch/arm/include/uapi/asm/kvm.h diff --git a/arch/arm64/include/uapi/asm/kvm.h b/tools/arch/arm64/include/uapi/asm/kvm.h similarity index 100% copy from arch/arm64/include/uapi/asm/kvm.h copy to tools/arch/arm64/include/uapi/asm/kvm.h diff --git a/arch/mips/include/uapi/asm/kvm.h b/tools/arch/mips/include/uapi/asm/kvm.h similarity index 100% copy from arch/mips/include/uapi/asm/kvm.h copy to tools/arch/mips/include/uapi/asm/kvm.h diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/tools/arch/powerpc/include/uapi/asm/kvm.h similarity index 100% copy from arch/powerpc/include/uapi/asm/kvm.h copy to tools/arch/powerpc/include/uapi/asm/kvm.h diff --git a/arch/s390/include/uapi/asm/kvm.h b/tools/arch/s390/include/uapi/asm/kvm.h similarity index 100% copy from arch/s390/include/uapi/asm/kvm.h copy to tools/arch/s390/include/uapi/asm/kvm.h diff --git a/arch/s390/include/uapi/asm/kvm_perf.h b/tools/arch/s390/include/uapi/asm/kvm_perf.h similarity index 100% copy from arch/s390/include/uapi/asm/kvm_perf.h copy to tools/arch/s390/include/uapi/asm/kvm_perf.h diff --git a/arch/s390/include/uapi/asm/sie.h b/tools/arch/s390/include/uapi/asm/sie.h similarity index 100% copy from arch/s390/include/uapi/asm/sie.h copy to tools/arch/s390/include/uapi/asm/sie.h diff --git a/arch/x86/include/uapi/asm/kvm.h b/tools/arch/x86/include/uapi/asm/kvm.h similarity index 100% copy from arch/x86/include/uapi/asm/kvm.h copy to tools/arch/x86/include/uapi/asm/kvm.h diff --git a/arch/x86/include/uapi/asm/kvm_perf.h b/tools/arch/x86/include/uapi/asm/kvm_perf.h similarity index 100% copy from arch/x86/include/uapi/asm/kvm_perf.h copy to tools/arch/x86/include/uapi/asm/kvm_perf.h diff --git a/arch/x86/include/uapi/asm/svm.h b/tools/arch/x86/include/uapi/asm/svm.h similarity index 100% copy from arch/x86/include/uapi/asm/svm.h copy to tools/arch/x86/include/uapi/asm/svm.h diff --git a/arch/x86/include/uapi/asm/vmx.h b/tools/arch/x86/include/uapi/asm/vmx.h similarity index 100% copy from arch/x86/include/uapi/asm/vmx.h copy to tools/arch/x86/include/uapi/asm/vmx.h diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index a4aefae..db7cfb4 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -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 diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 0d07672..feb2c66 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -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)