From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Daney <david.daney@cavium•com>,
Jiri Olsa <jolsa@kernel•org>,
Arnaldo Carvalho de Melo <acme@redhat•com>
Subject: linux-next: manual merge of the tip tree with the mips tree
Date: Mon, 13 Apr 2015 15:59:13 +1000 [thread overview]
Message-ID: <20150413155913.28eace15@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1195 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
tools/perf/config/Makefile between commit 4fd6ce055817 ("perf tools:
Hook up MIPS unwind and dwarf-regs in the Makefile") from the mips tree
and commit 3bc3374cc50c ("perf build: Add perf regs objects building")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc tools/perf/config/Makefile
index 0d0595e1ece8,59a98c643240..000000000000
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@@ -43,13 -47,10 +50,17 @@@ ifeq ($(ARCH),arm64
LIBUNWIND_LIBS = -lunwind -lunwind-aarch64
endif
+# Additional ARCH settings for MIPS
+ifeq ($(ARCH),mips)
+ ARCH_SUPPORTS_LIBUNWIND := 1
+ NO_PERF_REGS := 0
+ LIBUNWIND_LIBS = -lunwind -lunwind-mips
+endif
+
+ ifeq ($(NO_PERF_REGS),0)
+ $(call detected,CONFIG_PERF_REGS)
+ endif
+
# So far there's only x86 and arm libdw unwind support merged in perf.
# Disable it on all other architectures in case libdw unwind
# support is detected in system. Add supported architectures
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-13 5:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 5:59 Stephen Rothwell [this message]
2015-04-17 15:33 ` linux-next: manual merge of the tip tree with the mips tree Jiri Olsa
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 4:19 Stephen Rothwell
2016-03-14 2:18 Stephen Rothwell
2014-10-09 4:09 Stephen Rothwell
2014-01-15 5:06 Stephen Rothwell
2014-01-15 5:00 Stephen Rothwell
2011-11-23 2:01 Stephen Rothwell
2011-11-23 2:07 ` Deng-Cheng Zhu
2009-11-23 5:46 Stephen Rothwell
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=20150413155913.28eace15@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=acme@redhat$(echo .)com \
--cc=david.daney@cavium$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jolsa@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=ralf@linux-mips$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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