From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 29 Jul 2014 05:34:19 +0000 (+0800)
Subject: Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~38
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=77917ecac9c37f9f02e7954b617df8f824894778;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig
---

77917ecac9c37f9f02e7954b617df8f824894778
diff --cc arch/arm64/Kconfig
index 4fd9e56ef652,0677ff4814fa..3a8bfb12f726
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1,9 -1,7 +1,10 @@@
  config ARM64
  	def_bool y
  	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 +	select ARCH_USE_CMPXCHG_LOCKREF
 +	select ARCH_HAS_OPP
 +	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ 	select ARCH_SUPPORTS_ATOMIC_RMW
  	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
  	select ARCH_WANT_FRAME_POINTERS
diff --cc drivers/irqchip/irq-gic.c
index 65bc83747f66,c8ee1cb023b8..c366bab39df0
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -41,8 -41,8 +41,9 @@@
  #include <linux/slab.h>
  #include <linux/irqchip/chained_irq.h>
  #include <linux/irqchip/arm-gic.h>
 +#include <trace/events/arm-ipi.h>
  
+ #include <asm/cputype.h>
  #include <asm/irq.h>
  #include <asm/exception.h>
  #include <asm/smp_plat.h>