tools: Copy uapi/linux/hw_breakpoint.h from the kernel

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

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2016-07-13 07:17 UTC #0 lore raw

Commit-ID:  4998a1224686d74ab7f7789787f7f7f904c75dfc
Gitweb:     http://git.kernel.org/tip/4998a1224686d74ab7f7789787f7f7f904c75dfc
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 11 Jul 2016 23:37:18 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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 <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 {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(-)

tools/include/uapi/linux/hw_breakpoint.h renamed from include/uapi/linux/hw_breakpoint.h +0 -0

similarity index 100%
copy from include/uapi/linux/hw_breakpoint.h
copy to tools/include/uapi/linux/hw_breakpoint.h

tools/perf/MANIFEST +1 -2

index d15c052..a4aefae 100644
@@ -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

tools/perf/Makefile.perf +3 -0

index 34b91ba..0d07672 100644
@@ -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