Merge remote-tracking branch 'agust/next' into next

Brings some 52xx updates. Also manually merged tools/perf/perf.h.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --combined tools/perf/perf.h
index e2ba8f004d32826e57f776b71377f053052bd5dd,238f923f22181698f1610ed8b14f512b76706fb1..ad630d921bd61f6b2c3cb56f1b158adb76628aea
--- 1/tools/perf/perf.h
--- 2/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@@ -5,8 -5,9 +5,9 @@@ struct winsize
  
  void get_term_dimensions(struct winsize *ws);
  
+ #include <asm/unistd.h>
+ 
  #if defined(__i386__)
- #include "../../arch/x86/include/asm/unistd.h"
  #define rmb()         asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
  #define cpu_relax()   asm volatile("rep; nop" ::: "memory");
  #define CPUINFO_PROC  "model name"
@@@ -16,7 -17,6 +17,6 @@@
  #endif
  
  #if defined(__x86_64__)
- #include "../../arch/x86/include/asm/unistd.h"
  #define rmb()         asm volatile("lfence" ::: "memory")
  #define cpu_relax()   asm volatile("rep; nop" ::: "memory");
  #define CPUINFO_PROC  "model name"
@@@ -26,20 -26,17 +26,18 @@@
  #endif
  
  #ifdef __powerpc__
 +#include "../../arch/powerpc/include/uapi/asm/unistd.h"
  #define rmb()         asm volatile ("sync" ::: "memory")
  #define cpu_relax()   asm volatile ("" ::: "memory");
  #define CPUINFO_PROC  "cpu"
  #endif
  
  #ifdef __s390__
- #include "../../arch/s390/include/asm/unistd.h"
  #define rmb()         asm volatile("bcr 15,0" ::: "memory")
  #define cpu_relax()   asm volatile("" ::: "memory");
  #endif
  
  #ifdef __sh__
- #include "../../arch/sh/include/asm/unistd.h"
  #if defined(__SH4A__) || defined(__SH5__)
  # define rmb()                asm volatile("synco" ::: "memory")
  #else
@@@ -50,35 -47,30 +48,30 @@@
  #endif
  
  #ifdef __hppa__
- #include "../../arch/parisc/include/asm/unistd.h"
  #define rmb()         asm volatile("" ::: "memory")
  #define cpu_relax()   asm volatile("" ::: "memory");
  #define CPUINFO_PROC  "cpu"
  #endif
  
  #ifdef __sparc__
- #include "../../arch/sparc/include/uapi/asm/unistd.h"
  #define rmb()         asm volatile("":::"memory")
  #define cpu_relax()   asm volatile("":::"memory")
  #define CPUINFO_PROC  "cpu"
  #endif
  
  #ifdef __alpha__
- #include "../../arch/alpha/include/asm/unistd.h"
  #define rmb()         asm volatile("mb" ::: "memory")
  #define cpu_relax()   asm volatile("" ::: "memory")
  #define CPUINFO_PROC  "cpu model"
  #endif
  
  #ifdef __ia64__
- #include "../../arch/ia64/include/asm/unistd.h"
  #define rmb()         asm volatile ("mf" ::: "memory")
  #define cpu_relax()   asm volatile ("hint @pause" ::: "memory")
  #define CPUINFO_PROC  "model name"
  #endif
  
  #ifdef __arm__
- #include "../../arch/arm/include/asm/unistd.h"
  /*
   * Use the __kuser_memory_barrier helper in the CPU helper page. See
   * arch/arm/kernel/entry-armv.S in the kernel source for details.
@@@ -89,13 -81,11 +82,11 @@@
  #endif
  
  #ifdef __aarch64__
- #include "../../arch/arm64/include/asm/unistd.h"
  #define rmb()         asm volatile("dmb ld" ::: "memory")
  #define cpu_relax()   asm volatile("yield" ::: "memory")
  #endif
  
  #ifdef __mips__
- #include "../../arch/mips/include/asm/unistd.h"
  #define rmb()         asm volatile(                                   \
                                ".set   mips2\n\t"                      \
                                "sync\n\t"                              \
@@@ -112,7 -102,7 +103,7 @@@
  #include <sys/types.h>
  #include <sys/syscall.h>
  
- #include "../../include/uapi/linux/perf_event.h"
+ #include <linux/perf_event.h>
  #include "util/types.h"
  #include <stdbool.h>