Commit-ID:  470de0f39e901611c366fc3d584307ba5d13406a
Author:     Arnaldo Carvalho de Melo <>
AuthorDate: Mon, 31 Jul 2017 22:55:12 -0300
Committer:  Arnaldo Carvalho de Melo <>
CommitDate: Mon, 31 Jul 2017 23:04:59 -0300

tools perf: Do not check spaces/blank lines when checking header file copy drift

We copy headers from include/, arch/ to allow tools/ use defines,
structs from newer kernels and still be able to build on older systems.

We then, as part of a build, check if those copies got out of sync, when
we emit a warning, so that we can check if something needs to be
reflected on the tools, e.g. a 'perf trace' syscall argument beautifier
needs tweaking.

But we don't have to be super strict with that, for instance, extra
spaces, tabs or blank lines aren't problematic, so change to have "--ignore-blank-lines --ignore-space-change" as
default "diff" arguments.

Cc: Adrian Hunter <>
Cc: David Ahern <>
Cc: Jiri Olsa <>
Cc: Namhyung Kim <>
Cc: Wang Nan <>
Signed-off-by: Arnaldo Carvalho de Melo <>
 tools/perf/ | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/ b/tools/perf/
index ff0a5fa..3f0c657 100755
--- a/tools/perf/
+++ b/tools/perf/
@@ -37,7 +37,7 @@ include/uapi/asm-generic/mman-common.h
 check () {
-  opts=
+  opts="--ignore-blank-lines --ignore-space-change"
   while [ -n "$*" ]; do
@@ -58,7 +58,7 @@ for i in $HEADERS; do
 # diff with extra ignore lines
-check arch/x86/lib/memcpy_64.S        -B -I "^EXPORT_SYMBOL" -I "^#include 
-check arch/x86/lib/memset_64.S        -B -I "^EXPORT_SYMBOL" -I "^#include 
-check include/uapi/asm-generic/mman.h -B -I "^#include 
-check include/uapi/linux/mman.h       -B -I "^#include <\(uapi/\)*asm/mman.h>"
+check arch/x86/lib/memcpy_64.S        -I "^EXPORT_SYMBOL" -I "^#include 
+check arch/x86/lib/memset_64.S        -I "^EXPORT_SYMBOL" -I "^#include 
+check include/uapi/asm-generic/mman.h -I "^#include 
+check include/uapi/linux/mman.h       -I "^#include <\(uapi/\)*asm/mman.h>"

Reply via email to