linux-next: manual merge of the tip tree with the mips tree

From: Stephen Rothwell
Date: Mon Apr 13 2015 - 01:59:28 EST

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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

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

+# Additional ARCH settings for MIPS
+ifeq ($(ARCH),mips)
+ LIBUNWIND_LIBS = -lunwind -lunwind-mips
+ 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: pgp6dT_fBsvxA.pgp
Description: OpenPGP digital signature