From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Feb 2013 23:52:22 +0000 (+1100)
Subject: Merge remote-tracking branch 'metag/for-next'
X-Git-Tag: next-20130220~110
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae585d58e66b0cba5d9b8138b0218284471a2465;p=karo-tx-linux.git

Merge remote-tracking branch 'metag/for-next'

Conflicts:
	tools/perf/perf.h
---

ae585d58e66b0cba5d9b8138b0218284471a2465
diff --cc tools/perf/perf.h
index 8a68ad39e1b6,768507e079e2..f284e0aade65
--- 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>