lkml.org 
[lkml]   [2013]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the metag tree with the arc tree
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>
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-02-06 01:41    [W:0.042 / U:1.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site