From: "tip-bot2 for Arnaldo Carvalho de Melo" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Josh Poimboeuf <jpoimboe@redhat.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: perf/core] objtool: Update sync-check.sh from perf's check-headers.sh
Date: Mon, 02 Sep 2019 08:16:44 -0000 [thread overview]
Message-ID: <156741220469.17404.17592526465433413478.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190830193109.p7jagidsrahoa4pn@treble>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 2ffd84ae973b5ad16be96840574bb1142fda268a
Gitweb: https://git.kernel.org/tip/2ffd84ae973b5ad16be96840574bb1142fda268a
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Sat, 31 Aug 2019 17:29:47 -03:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Sat, 31 Aug 2019 22:27:52 -03:00
objtool: Update sync-check.sh from perf's check-headers.sh
To allow using the -I trick that will be needed for checking the x86
insn decoder files.
Without the specific -I lines we still get the same warnings as before:
$ make -C tools/objtool/ clean ; make -C tools/objtool/
make: Entering directory '/home/acme/git/perf/tools/objtool'
CLEAN objtool
find -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
rm -f arch/x86/inat-tables.c fixdep
<SNIP>
LD objtool-in.o
make[1]: Leaving directory '/home/acme/git/perf/tools/objtool'
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/inat.h' differs from latest version at 'arch/x86/include/asm/inat.h'
diff -u tools/arch/x86/include/asm/inat.h arch/x86/include/asm/inat.h
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/insn.h' differs from latest version at 'arch/x86/include/asm/insn.h'
diff -u tools/arch/x86/include/asm/insn.h arch/x86/include/asm/insn.h
Warning: Kernel ABI header at 'tools/arch/x86/lib/inat.c' differs from latest version at 'arch/x86/lib/inat.c'
diff -u tools/arch/x86/lib/inat.c arch/x86/lib/inat.c
Warning: Kernel ABI header at 'tools/arch/x86/lib/insn.c' differs from latest version at 'arch/x86/lib/insn.c'
diff -u tools/arch/x86/lib/insn.c arch/x86/lib/insn.c
/home/acme/git/perf/tools/objtool
LINK objtool
make: Leaving directory '/home/acme/git/perf/tools/objtool'
$
The next patch will add the -I lines for those files.
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: http://lore.kernel.org/lkml/20190830193109.p7jagidsrahoa4pn@treble
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/n/tip-vu3p38mnxlwd80rlsnjkqcf2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/objtool/sync-check.sh | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh
index 66f1575..6fa87de 100755
--- a/tools/objtool/sync-check.sh
+++ b/tools/objtool/sync-check.sh
@@ -12,18 +12,39 @@ arch/x86/lib/x86-opcode-map.txt
arch/x86/tools/gen-insn-attr-x86.awk
'
-check()
-{
- local file=$1
+check_2 () {
+ file1=$1
+ file2=$2
- diff ../$file ../../$file > /dev/null ||
- echo "Warning: synced file at 'tools/objtool/$file' differs from latest kernel version at '$file'"
+ shift
+ shift
+
+ cmd="diff $* $file1 $file2 > /dev/null"
+
+ test -f $file2 && {
+ eval $cmd || {
+ echo "Warning: Kernel ABI header at '$file1' differs from latest version at '$file2'" >&2
+ echo diff -u $file1 $file2
+ }
+ }
+}
+
+check () {
+ file=$1
+
+ shift
+
+ check_2 tools/$file $file $*
}
if [ ! -d ../../kernel ] || [ ! -d ../../tools ] || [ ! -d ../objtool ]; then
exit 0
fi
+cd ../..
+
for i in $FILES; do
check $i
done
+
+cd -
next prev parent reply other threads:[~2019-09-02 8:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 22:41 [PATCH 0/4] objtool,perf: Use shared x86 insn decoder Josh Poimboeuf
2019-08-29 22:41 ` [PATCH 1/4] objtool: Move x86 insn decoder to a common location Josh Poimboeuf
2019-09-02 8:16 ` [tip: perf/core] " tip-bot2 for Josh Poimboeuf
2019-08-29 22:41 ` [PATCH 2/4] perf: Update .gitignore file Josh Poimboeuf
2019-09-02 8:16 ` [tip: perf/core] " tip-bot2 for Josh Poimboeuf
2019-08-29 22:41 ` [PATCH 3/4] perf intel-pt: Remove inat.c from build dependency list Josh Poimboeuf
2019-09-02 8:16 ` [tip: perf/core] " tip-bot2 for Josh Poimboeuf
2019-08-29 22:41 ` [PATCH 4/4] perf intel-pt: Use shared x86 insn decoder Josh Poimboeuf
2019-08-30 19:59 ` Arnaldo Carvalho de Melo
2019-08-30 20:06 ` Arnaldo Carvalho de Melo
2019-08-30 20:10 ` Josh Poimboeuf
2019-09-02 8:16 ` [tip: perf/core] " tip-bot2 for Josh Poimboeuf
2019-08-30 7:19 ` [PATCH 0/4] objtool,perf: " Peter Zijlstra
2019-08-30 15:20 ` Masami Hiramatsu
2019-08-30 15:41 ` Arnaldo Carvalho de Melo
2019-08-30 18:40 ` Arnaldo Carvalho de Melo
2019-08-30 19:00 ` Arnaldo Carvalho de Melo
2019-08-30 19:31 ` Josh Poimboeuf
2019-08-30 19:48 ` Arnaldo Carvalho de Melo
2019-08-31 1:51 ` Masami Hiramatsu
2019-08-31 20:19 ` Arnaldo Carvalho de Melo
2019-09-01 2:36 ` Masami Hiramatsu
2019-09-02 8:16 ` tip-bot2 for Arnaldo Carvalho de Melo [this message]
2019-09-02 8:16 ` [tip: perf/core] objtool: Ignore intentional differences for the " tip-bot2 for Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=156741220469.17404.17592526465433413478.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=bp@alien8.de \
--cc=jolsa@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).