diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-17 21:59:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-17 21:59:05 +0000 |
| commit | 43e7406efd7822d75c64310461d2cbca0ece19f0 (patch) | |
| tree | 22a7e030ac75c7db2b767292c59c9a36bb810c9c /arch/s390 | |
| parent | 42f504e28a169ebfea0e3d9c6e151451800e41d5 (diff) | |
| parent | 3d95e2f8f6c3666ffb3f5aee405ecc15a14ea570 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk
Conflicts:
arch/arm64/Kconfig
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index d8d6eeca56b0..61ea838bc50b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -62,6 +62,7 @@ config S390 def_bool y select ARCH_DISCARD_MEMBLOCK select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE + select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_INLINE_READ_LOCK select ARCH_INLINE_READ_LOCK_BH |