From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752137AbcGMHR7 (ORCPT ); Wed, 13 Jul 2016 03:17:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41476 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100AbcGMHRu (ORCPT ); Wed, 13 Jul 2016 03:17:50 -0400 Date: Wed, 13 Jul 2016 00:17:38 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: tglx@linutronix.de, acme@redhat.com, adrian.hunter@intel.com, mingo@kernel.org, hpa@zytor.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, dsahern@gmail.com, jolsa@kernel.org Reply-To: wangnan0@huawei.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, jolsa@kernel.org, tglx@linutronix.de, acme@redhat.com, adrian.hunter@intel.com, hpa@zytor.com, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Copy uapi/linux/hw_breakpoint.h from the kernel Git-Commit-ID: 4998a1224686d74ab7f7789787f7f7f904c75dfc 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: 4998a1224686d74ab7f7789787f7f7f904c75dfc Gitweb: http://git.kernel.org/tip/4998a1224686d74ab7f7789787f7f7f904c75dfc Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 11 Jul 2016 23:37:18 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Jul 2016 15:20:34 -0300 tools: Copy uapi/linux/hw_breakpoint.h from the kernel To allow the build to complete on older systems, where those files are either not uptodate, lacking some recent additions or not present at all. And check if the copy drifts from the kernel. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-3jz31pz4nw526uko5da9e7o3@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- {include => tools/include}/uapi/linux/hw_breakpoint.h | 0 tools/perf/MANIFEST | 3 +-- tools/perf/Makefile.perf | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/hw_breakpoint.h b/tools/include/uapi/linux/hw_breakpoint.h similarity index 100% copy from include/uapi/linux/hw_breakpoint.h copy to tools/include/uapi/linux/hw_breakpoint.h diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index d15c052..a4aefae 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -61,6 +61,7 @@ tools/include/linux/list.h tools/include/linux/log2.h tools/include/uapi/linux/bpf.h tools/include/uapi/linux/bpf_common.h +tools/include/uapi/linux/hw_breakpoint.h tools/include/uapi/linux/perf_event.h tools/include/linux/poison.h tools/include/linux/rbtree.h @@ -82,10 +83,8 @@ arch/*/include/asm/unistd*.h arch/*/include/uapi/asm/unistd*.h tools/arch/*/include/uapi/asm/perf_regs.h include/linux/poison.h -include/linux/hw_breakpoint.h include/uapi/linux/const.h include/uapi/linux/swab.h -include/uapi/linux/hw_breakpoint.h arch/x86/include/asm/svm.h arch/x86/include/asm/vmx.h arch/x86/include/asm/kvm_host.h diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 34b91ba..0d07672 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -348,6 +348,9 @@ $(PERF_IN): prepare FORCE @(test -f ../../include/uapi/linux/perf_event.h && ( \ (diff -B ../include/uapi/linux/perf_event.h ../../include/uapi/linux/perf_event.h >/dev/null) \ || echo "Warning: tools/include/uapi/linux/perf_event.h differs from kernel" >&2 )) || true + @(test -f ../../include/uapi/linux/hw_breakpoint.h && ( \ + (diff -B ../include/uapi/linux/hw_breakpoint.h ../../include/uapi/linux/hw_breakpoint.h >/dev/null) \ + || echo "Warning: tools/include/uapi/linux/hw_breakpoint.h differs from kernel" >&2 )) || true @(test -f ../../arch/x86/include/asm/disabled-features.h && ( \ (diff -B ../arch/x86/include/asm/disabled-features.h ../../arch/x86/include/asm/disabled-features.h >/dev/null) \ || echo "Warning: tools/arch/x86/include/asm/disabled-features.h differs from kernel" >&2 )) || true