From: Mark Brown <broonie@kernel.org>
Date: Tue, 17 Mar 2015 21:59:05 +0000 (+0000)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~19^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43e7406efd7822d75c64310461d2cbca0ece19f0;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig
---

43e7406efd7822d75c64310461d2cbca0ece19f0
diff --cc arch/arm/Kconfig
index c1d6aa708ccd,143846a2c517..9422f298f32f
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -4,8 -4,8 +4,9 @@@ config AR
  	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
  	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
  	select ARCH_HAVE_CUSTOM_GPIO_H
 +	select ARCH_SUPPORTS_ATOMIC_RMW
  	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ 	select ARCH_HAS_GCOV_PROFILE_ALL
  	select ARCH_WANT_IPC_PARSE_VERSION
  	select BUILDTIME_EXTABLE_SORT if MMU
  	select CPU_PM if (SUSPEND || CPU_IDLE)
diff --cc arch/arm64/Kconfig
index 2cf752060a41,177723e0fee0..7ac540c14bce
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1,11 -1,7 +1,12 @@@
  config ARM64
  	def_bool y
  	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 +	select ARCH_HAS_OPP
 +	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_HAS_GCOV_PROFILE_ALL
  	select ARCH_WANT_OPTIONAL_GPIOLIB
  	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
  	select ARCH_WANT_FRAME_POINTERS