linux-kernel - linux-next: manual merge of the metag tree with the arc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130206110346.edff1db373e5badee7df04c4@canb.auug.org.au>
Date:	Wed, 6 Feb 2013 11:03:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Hogan <james.hogan@...tec.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vineet Gupta <vgupta@...opsys.com>
Subject: linux-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@...b.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>

Content of type "application/pgp-signature" skipped