From: Richard Weinberger <richard@nod.at>
Date: Tue, 30 Oct 2018 11:58:12 +0000 (+0100)
Subject: um: Make GCOV depend on !KCOV
X-Git-Tag: v4.19.88~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48b140f563ad61a7d0b529bc85c13417bb9f141d;p=thirdparty%2Fkernel%2Fstable.git

um: Make GCOV depend on !KCOV

[ Upstream commit 550ed0e2036663b35cec12374b835444f9c60454 ]

Both do more or less the same thing and are mutually exclusive.
If both are enabled the build will fail.
Sooner or later we can kill UML's GCOV.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/arch/um/Kconfig.debug b/arch/um/Kconfig.debug
index 2014597605ea9..85726eeec3451 100644
--- a/arch/um/Kconfig.debug
+++ b/arch/um/Kconfig.debug
@@ -16,6 +16,7 @@ config GPROF
 config GCOV
 	bool "Enable gcov support"
 	depends on DEBUG_INFO
+	depends on !KCOV
 	help
 	  This option allows developers to retrieve coverage data from a UML
 	  session.