From: Nick Desaulniers <ndesaulniers@google.com>
To: oberpar@linux.ibm.com, akpm@linux-foundation.org
Cc: Nick Desaulniers <ndesaulniers@google.com>,
Greg Hackmann <ghackmann@android.com>, Tri Vo <trong@android.com>,
linux-mm@kvack.org, kbuild-all@01.org,
Randy Dunlap <rdunlap@infradead.org>,
kbuild test robot <lkp@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] gcov: fix when CONFIG_MODULES is not set
Date: Fri, 29 Mar 2019 11:18:39 -0700 [thread overview]
Message-ID: <20190329181839.139301-1-ndesaulniers@google.com> (raw)
In-Reply-To: <eea3ce6a-732b-5c1d-9975-eddaeee21cf5@infradead.org>
Fixes commit 8c3d220cb6b5 ("gcov: clang support")
Cc: Greg Hackmann <ghackmann@android.com>
Cc: Tri Vo <trong@android.com>
Cc: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: linux-mm@kvack.org
Cc: kbuild-all@01.org
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kbuild test robot <lkp@intel.com>
Link: https://marc.info/?l=linux-mm&m=155384681109231&w=2
Signed-off-by: Nick Desaulniers <ndesaulniers@google.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
next prev parent reply other threads:[~2019-03-29 18:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <201903291603.7podsjD7%lkp@intel.com>
2019-03-29 17:45 ` [PATCH] gcov: include linux/module.h for within_module Nick Desaulniers
2019-03-29 18:01 ` Randy Dunlap
2019-03-29 18:08 ` Randy Dunlap
2019-03-29 18:09 ` Nick Desaulniers
2019-03-29 18:10 ` Randy Dunlap
2019-03-29 18:18 ` Nick Desaulniers [this message]
2019-03-29 20:53 ` [PATCH v2] gcov: fix when CONFIG_MODULES is not set Randy Dunlap
2019-03-30 23:57 ` Tri Vo
2019-04-02 2:54 ` Nick Desaulniers
2019-04-03 15:24 ` Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190329181839.139301-1-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=akpm@linux-foundation.org \
--cc=ghackmann@android.com \
--cc=kbuild-all@01.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lkp@intel.com \
--cc=oberpar@linux.ibm.com \
--cc=rdunlap@infradead.org \
--cc=trong@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).