Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm/include/asm/hardware/coresight.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/include/asm/hardware/coresight.h
index 4aee45da6d599501cc1afd08bc1bdf6593f240ec,ad774f37c47cda0f6201d7a7aad7d967cec4786b..fc53019c304b6c15c70f6302f54a17671ad1543d
--- 1/arch/arm/include/asm/hardware/coresight.h
--- 2/arch/arm/include/asm/hardware/coresight.h
+++ b/arch/arm/include/asm/hardware/coresight.h
@@@ -166,16 -140,14 +166,16 @@@
  #define ETBFF_TRIGIN          BIT(8)
  #define ETBFF_TRIGEVT         BIT(9)
  #define ETBFF_TRIGFL          BIT(10)
 +#define ETBFF_STOPFL          BIT(12)
  
  #define etb_writel(t, v, x) \
-       (__raw_writel((v), (t)->etb_regs + (x)))
- #define etb_readl(t, x) (__raw_readl((t)->etb_regs + (x)))
+       (writel_relaxed((v), (t)->etb_regs + (x)))
+ #define etb_readl(t, x) (readl_relaxed((t)->etb_regs + (x)))
  
 -#define etm_lock(t) do { etm_writel((t), 0, CSMR_LOCKACCESS); } while (0)
 -#define etm_unlock(t) \
 -      do { etm_writel((t), CS_LAR_KEY, CSMR_LOCKACCESS); } while (0)
 +#define etm_lock(t, id) \
 +      do { etm_writel((t), (id), 0, CSMR_LOCKACCESS); } while (0)
 +#define etm_unlock(t, id) \
 +      do { etm_writel((t), (id), CS_LAR_KEY, CSMR_LOCKACCESS); } while (0)
  
  #define etb_lock(t) do { etb_writel((t), 0, CSMR_LOCKACCESS); } while (0)
  #define etb_unlock(t) \

diff --cc arch/arm64/mm/proc.S
Simple merge