[tip:perf/core] tools: Copy uapi/asm/perf_regs.h from the kernel

[tip:perf/core] tools: Copy uapi/asm/perf_regs.h from the kernel

[tip-bot for Arnaldo Carvalho de Melo]

Commit-ID:  12f020338a2ca5db99db40b3cf8e4df88744c541
Gitweb:     http://git.kernel.org/tip/12f020338a2ca5db99db40b3cf8e4df88744c541
Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Mon, 11 Jul 2016 21:16:52 -0300
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 12 Jul 2016 15:20:33 -0300

tools: Copy uapi/asm/perf_regs.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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-sxf7rpow2blsno5f7t6n0sqz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 {arch => tools/arch}/arm/include/uapi/asm/perf_regs.h     |  0
 {arch => tools/arch}/arm64/include/uapi/asm/perf_regs.h   |  0
 {arch => tools/arch}/powerpc/include/uapi/asm/perf_regs.h |  0
 {arch => tools/arch}/x86/include/uapi/asm/perf_regs.h     |  0
 tools/perf/MANIFEST                                       |  2 +-
 tools/perf/Makefile.perf                                  | 12 ++++++++++++
 tools/perf/config/Makefile                                |  3 ++-
 7 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/uapi/asm/perf_regs.h b/tools/arch/arm/include/uapi/asm/perf_regs.h
similarity index 100%
copy from arch/arm/include/uapi/asm/perf_regs.h
copy to tools/arch/arm/include/uapi/asm/perf_regs.h
diff --git a/arch/arm64/include/uapi/asm/perf_regs.h b/tools/arch/arm64/include/uapi/asm/perf_regs.h
similarity index 100%
copy from arch/arm64/include/uapi/asm/perf_regs.h
copy to tools/arch/arm64/include/uapi/asm/perf_regs.h
diff --git a/arch/powerpc/include/uapi/asm/perf_regs.h b/tools/arch/powerpc/include/uapi/asm/perf_regs.h
similarity index 100%
copy from arch/powerpc/include/uapi/asm/perf_regs.h
copy to tools/arch/powerpc/include/uapi/asm/perf_regs.h
diff --git a/arch/x86/include/uapi/asm/perf_regs.h b/tools/arch/x86/include/uapi/asm/perf_regs.h
similarity index 100%
copy from arch/x86/include/uapi/asm/perf_regs.h
copy to tools/arch/x86/include/uapi/asm/perf_regs.h
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index a300cbb..d15c052 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -80,7 +80,7 @@ include/linux/stringify.h
 include/linux/swab.h
 arch/*/include/asm/unistd*.h
 arch/*/include/uapi/asm/unistd*.h
-arch/*/include/uapi/asm/perf_regs.h
+tools/arch/*/include/uapi/asm/perf_regs.h
 include/linux/poison.h
 include/linux/hw_breakpoint.h
 include/uapi/linux/const.h
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 809735c..34b91ba 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -363,6 +363,18 @@ $(PERF_IN): prepare FORCE
 	@(test -f ../../arch/x86/lib/memset_64.S && ( \
         (diff -B ../arch/x86/lib/memset_64.S ../../arch/x86/lib/memset_64.S >/dev/null) \
         || echo "Warning: tools/arch/x86/lib/memset_64.S differs from kernel" >&2 )) || true
+	@(test -f ../../arch/arm/include/uapi/asm/perf_regs.h && ( \
+        (diff -B ../arch/arm/include/uapi/asm/perf_regs.h ../../arch/arm/include/uapi/asm/perf_regs.h >/dev/null) \
+        || echo "Warning: tools/arch/arm/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/arm64/include/uapi/asm/perf_regs.h && ( \
+        (diff -B ../arch/arm64/include/uapi/asm/perf_regs.h ../../arch/arm64/include/uapi/asm/perf_regs.h >/dev/null) \
+        || echo "Warning: tools/arch/arm64/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true
+	@(test -f ../../arch/powerpc/include/uapi/asm/perf_regs.h && ( \
+        (diff -B ../arch/powerpc/include/uapi/asm/perf_regs.h ../../arch/powerpc/include/uapi/asm/perf_regs.h >/dev/null) \
+        || echo "Warning: tools/arch/powerpc/include/uapi/asm/perf_regs.h differs from kernel" >&2 )) || true
+	@(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
 	$(Q)$(MAKE) $(build)=perf
 
 $(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(LIBTRACEEVENT_DYNAMIC_LIST)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index d629e5f..49a2130 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -208,9 +208,10 @@ CFLAGS += -I$(src-perf)/util/include
 CFLAGS += -I$(src-perf)/arch/$(ARCH)/include
 CFLAGS += -I$(srctree)/tools/include/uapi
 CFLAGS += -I$(srctree)/tools/include/
+CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/uapi
+CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/
 CFLAGS += -I$(srctree)/arch/$(ARCH)/include/uapi
 CFLAGS += -I$(srctree)/arch/$(ARCH)/include
-CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/include/uapi
 CFLAGS += -I$(srctree)/tools/arch/$(ARCH)/
 CFLAGS += -I$(srctree)/include/uapi
 CFLAGS += -I$(srctree)/include