Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1594822

[PATCH RT 8/9] lockdep: Fix compilation error for !CONFIG_MODULES and

Show all headers | View raw

4.1.38-rt46-rc1 stable review patch.
If you have any objection to the inclusion of this patch, let me know.

--- 8< --- 8< --- 8< ---
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>
(cherry picked from commit a88182f3f1818407d738e832650085110cae1f29)
Signed-off-by: Julia Cartwright <julia@ni.com>
---
 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 af9a771a9346..2fd71ecdd63a 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -539,6 +539,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 b4ebb2fd4849..a7ac858fd1a1 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -599,6 +599,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.11.1

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH RT 0/9] Linux 4.1.38-rt46-rc1 Julia Cartwright <julia@ni.com> - 2017-03-08 01:10 +0100
  [PATCH RT 6/9] lockdep: Handle statically initialized PER_CPU locks Julia Cartwright <julia@ni.com> - 2017-03-08 01:30 +0100
  [PATCH RT 7/9] rt: Drop the removal of _GPL from rt_mutex_destroy()'s Julia Cartwright <julia@ni.com> - 2017-03-08 01:40 +0100
  [PATCH RT 5/9] rt: Drop mutex_disable() on !DEBUG configs and the GPL Julia Cartwright <julia@ni.com> - 2017-03-08 01:40 +0100
  [PATCH RT 9/9] Linux 4.1.38-rt46-rc1 Julia Cartwright <julia@ni.com> - 2017-03-08 02:00 +0100
  [PATCH RT 1/9] cpuset: Convert callback_lock to raw_spinlock_t Julia Cartwright <julia@ni.com> - 2017-03-08 02:00 +0100
  [PATCH RT 2/9] radix-tree: use local locks Julia Cartwright <julia@ni.com> - 2017-03-08 02:20 +0100
  [PATCH RT 8/9] lockdep: Fix compilation error for !CONFIG_MODULES and Julia Cartwright <julia@ni.com> - 2017-03-08 04:40 +0100

csiph-web