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

Conflicts:
	arch/arm64/Kconfig

diff --cc arch/arm/Kconfig
index c1d6aa708ccdeb8c174bc05d258b65e5ecdc499e,143846a2c5170ece36eab0b87c08657772f16e19..9422f298f32fde35793d00ae882e0ddbf9315d8a
--- 1/arch/arm/Kconfig
--- 2/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 2cf752060a41f83e85dc1b2797bfdd651afda6bf,177723e0fee05e45a74f498bf19089e2f30182bd..7ac540c14bcec8fc2ff3eb3943df1b9459a0a7f7
--- 1/arch/arm64/Kconfig
--- 2/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

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc kernel/module.c
Simple merge