[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190329181839.139301-1-ndesaulniers@google.com>
Date: Fri, 29 Mar 2019 11:18:39 -0700
From: Nick Desaulniers <ndesaulniers@...gle.com>
To: oberpar@...ux.ibm.com, akpm@...ux-foundation.org
Cc: Nick Desaulniers <ndesaulniers@...gle.com>,
Greg Hackmann <ghackmann@...roid.com>,
Tri Vo <trong@...roid.com>, linux-mm@...ck.org,
kbuild-all@...org, Randy Dunlap <rdunlap@...radead.org>,
kbuild test robot <lkp@...el.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH v2] gcov: fix when CONFIG_MODULES is not set
Fixes commit 8c3d220cb6b5 ("gcov: clang support")
Cc: Greg Hackmann <ghackmann@...roid.com>
Cc: Tri Vo <trong@...roid.com>
Cc: Peter Oberparleiter <oberpar@...ux.ibm.com>
Cc: linux-mm@...ck.org
Cc: kbuild-all@...org
Reported-by: Randy Dunlap <rdunlap@...radead.org>
Reported-by: kbuild test robot <lkp@...el.com>
Link: https://marc.info/?l=linux-mm&m=155384681109231&w=2
Signed-off-by: Nick Desaulniers <ndesaulniers@...gle.com>
---
kernel/gcov/gcc_3_4.c | 4 ++++
kernel/gcov/gcc_4_7.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/kernel/gcov/gcc_3_4.c b/kernel/gcov/gcc_3_4.c
index 801ee4b0b969..8fc30f178351 100644
--- a/kernel/gcov/gcc_3_4.c
+++ b/kernel/gcov/gcc_3_4.c
@@ -146,7 +146,11 @@ void gcov_info_unlink(struct gcov_info *prev, struct gcov_info *info)
*/
bool gcov_info_within_module(struct gcov_info *info, struct module *mod)
{
+#ifdef CONFIG_MODULES
return within_module((unsigned long)info, mod);
+#else
+ return false;
+#endif
}
/* Symbolic links to be created for each profiling data file. */
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c
index ec37563674d6..0b6886d4a4dd 100644
--- a/kernel/gcov/gcc_4_7.c
+++ b/kernel/gcov/gcc_4_7.c
@@ -159,7 +159,11 @@ void gcov_info_unlink(struct gcov_info *prev, struct gcov_info *info)
*/
bool gcov_info_within_module(struct gcov_info *info, struct module *mod)
{
+#ifdef CONFIG_MODULES
return within_module((unsigned long)info, mod);
+#else
+ return false;
+#endif
}
/* Symbolic links to be created for each profiling data file. */
--
2.21.0.392.gf8f6787159e-goog
Powered by blists - more mailing lists