From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Julia Cartwright <julia@ni.com>, Dan Murphy <dmurphy@ti.com>
Subject: [PATCH RT 6/7] lockdep: Fix compilation error for !CONFIG_MODULES and !CONFIG_SMP
Date: Wed, 08 Mar 2017 15:30:13 -0500 [thread overview]
Message-ID: <20170308203022.754839943@goodmis.org> (raw)
In-Reply-To: 20170308203007.731237400@goodmis.org
[-- Attachment #1: 0006-lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch --]
[-- Type: text/plain, Size: 1941 bytes --]
3.10.105-rt120-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Dan Murphy <dmurphy@ti.com>
When CONFIG_MODULES is not set then it fails to compile in lockdep:
|kernel/locking/lockdep.c: In function 'look_up_lock_class':
|kernel/locking/lockdep.c:684:12: error: implicit declaration of function
| '__is_module_percpu_address' [-Werror=implicit-function-declaration]
If CONFIG_MODULES is set but CONFIG_SMP is not, then it compiles but
fails link at the end:
|kernel/locking/lockdep.c:684: undefined reference to `__is_module_percpu_address'
|kernel/built-in.o:(.debug_addr+0x1e674): undefined reference to `__is_module_percpu_address'
This patch adds the function for both cases.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
[bigeasy: merge the two patches from Dan into one, adapt changelog]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
include/linux/module.h | 5 +++++
kernel/module.c | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/include/linux/module.h b/include/linux/module.h
index f75ab887838d..54090c4931bc 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -540,6 +540,11 @@ static inline bool is_module_percpu_address(unsigned long addr)
return false;
}
+static inline bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
+{
+ return false;
+}
+
static inline bool is_module_text_address(unsigned long addr)
{
return false;
diff --git a/kernel/module.c b/kernel/module.c
index 2e32c2b42e3a..8f762a1bb944 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -596,6 +596,11 @@ bool is_module_percpu_address(unsigned long addr)
return false;
}
+bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
+{
+ return false;
+}
+
#endif /* CONFIG_SMP */
#define MODINFO_ATTR(field) \
--
2.10.2
next prev parent reply other threads:[~2017-03-08 20:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-08 20:30 [PATCH RT 0/7] Linux 3.10.105-rt120-rc1 Steven Rostedt
2017-03-08 20:30 ` [PATCH RT 1/7] radix-tree: use local locks Steven Rostedt
2017-03-08 20:30 ` [PATCH RT 2/7] x86/mm/cpa: avoid wbinvd() for PREEMPT Steven Rostedt
2017-03-08 20:30 ` [PATCH RT 3/7] rt: Drop mutex_disable() on !DEBUG configs and the GPL suffix from export symbol Steven Rostedt
2017-03-08 20:30 ` [PATCH RT 4/7] lockdep: Handle statically initialized PER_CPU locks proper Steven Rostedt
2017-03-08 20:30 ` [PATCH RT 5/7] rt: Drop the removal of _GPL from rt_mutex_destroy()s EXPORT_SYMBOL Steven Rostedt
2017-03-08 20:30 ` Steven Rostedt [this message]
2017-03-08 20:30 ` [PATCH RT 7/7] Linux 3.10.105-rt120-rc1 Steven Rostedt
-- strict thread matches above, loose matches on Subject: below --
2017-03-08 20:22 [PATCH RT 0/7] Linux 3.12.70-rt95-rc1 Steven Rostedt
2017-03-08 20:22 ` [PATCH RT 6/7] lockdep: Fix compilation error for !CONFIG_MODULES and !CONFIG_SMP Steven Rostedt
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=20170308203022.754839943@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=dmurphy@ti.com \
--cc=jkacur@redhat.com \
--cc=julia@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=tglx@linutronix.de \
/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).