Skip to contentSkip to conversation

perf bench mem: Ignore export.h related changes to mem{cpy,set}.S

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

lore
Share & tools
lore
#0 lore raw
Commit-ID:  e0c4758278e2452ad28149f620b81ce43b2df7b6
Gitweb:     http://git.kernel.org/tip/e0c4758278e2452ad28149f620b81ce43b2df7b6
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 25 Oct 2016 16:39:21 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 28 Oct 2016 11:29:43 -0200

perf bench mem: Ignore export.h related changes to mem{cpy,set}.S

Ignore export.h and EXPORT_SYMBOL in:

784d5699eddc ("x86: move exports to actual definitions")

We're not dragging this stuff, not useful in tools/

This silences the following warnings while building perf:

Warning: tools/arch/x86/lib/memcpy_64.S differs from kernel
Warning: tools/arch/x86/lib/memset_64.S differs from kernel

---
 tools/perf/Makefile.perf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/Makefile.perf +2 -2
index 982d643..7de14f4 100644
@@ -381,10 +381,10 @@ $(PERF_IN): prepare FORCE
         (diff -B ../arch/x86/include/asm/cpufeatures.h ../../arch/x86/include/asm/cpufeatures.h >/dev/null) \
         || echo "Warning: tools/arch/x86/include/asm/cpufeatures.h differs from kernel" >&2 )) || true
 	@(test -f ../../arch/x86/lib/memcpy_64.S && ( \
-        (diff -B ../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memcpy_64.S >/dev/null) \
+        (diff -B -I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" ../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memcpy_64.S >/dev/null) \
         || echo "Warning: tools/arch/x86/lib/memcpy_64.S differs from kernel" >&2 )) || true
 	@(test -f ../../arch/x86/lib/memset_64.S && ( \
-        (diff -B ../arch/x86/lib/memset_64.S ../../arch/x86/lib/memset_64.S >/dev/null) \
+        (diff -B -I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" ../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) \