From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Hogan <james.hogan@imgtec.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vineet Gupta <vgupta@synopsys.com>
Subject: linux-next: manual merge of the metag tree with the arc tree
Date: Wed, 6 Feb 2013 11:03:46 +1100 [thread overview]
Message-ID: <20130206110346.edff1db373e5badee7df04c4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
Hi James,
Today's linux-next merge of the metag tree got a conflict in
tools/perf/perf.h between commit 12bf48ef6194 ("perf, ARC: Enable
building perf tools for ARC") from the arc tree and commit 6c4a2bebec36
("perf: Enable building perf tools for Meta") from the metag 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/perf.h
index 8a68ad3,768507e..0000000
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@@ -98,12 -98,12 +98,18 @@@ void get_term_dimensions(struct winsiz
#define CPUINFO_PROC "cpu model"
#endif
+#ifdef __arc__
+#define rmb() asm volatile("" ::: "memory")
+#define cpu_relax() rmb()
+#define CPUINFO_PROC "Processor"
+#endif
+
+ #ifdef __metag__
+ #define rmb() asm volatile("" ::: "memory")
+ #define cpu_relax() asm volatile("" ::: "memory")
+ #define CPUINFO_PROC "CPU"
+ #endif
+
#include <time.h>
#include <unistd.h>
#include <sys/types.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-02-06 0:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-06 0:03 Stephen Rothwell [this message]
2013-02-06 13:01 ` James Hogan
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=20130206110346.edff1db373e5badee7df04c4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=vgupta@synopsys.com \
/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
all inboxes | Powered by JetHome®