summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2017-02-24 08:41:49 -0600
committerSteven Rostedt <rostedt@goodmis.org>2017-06-07 19:03:34 -0400
commit75c561404e87cf021eed81f97365c9b3f1ea0613 (patch)
tree94f7177a3549a408d560b97823780571d93b6074
parentd0ab57a356952b5617f400f277fe4c1bf26aafb4 (diff)
downloadlinux-rt-75c561404e87cf021eed81f97365c9b3f1ea0613.tar.gz
lockdep: Fix compilation error for !CONFIG_MODULES and !CONFIG_SMP
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>
-rw-r--r--include/linux/module.h5
-rw-r--r--kernel/module.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index 7ae21ed9453d..874504dcc825 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -543,6 +543,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 4347aa243941..64135e935223 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -604,6 +604,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) \