diff options
| -rw-r--r-- | patches/localversion.patch | 2 | ||||
| -rw-r--r-- | patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch | 55 | ||||
| -rw-r--r-- | patches/series | 1 |
3 files changed, 57 insertions, 1 deletions
diff --git a/patches/localversion.patch b/patches/localversion.patch index e16fb07c0a7d..58842b503a27 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt10 ++-rt11 diff --git a/patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch b/patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch new file mode 100644 index 000000000000..e19e0155e517 --- /dev/null +++ b/patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch @@ -0,0 +1,55 @@ +From: Dan Murphy <dmurphy@ti.com> +Date: Fri, 24 Feb 2017 08:41:49 -0600 +Subject: [PATCH] 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> +--- + include/linux/module.h | 5 +++++ + kernel/module.c | 5 +++++ + 2 files changed, 10 insertions(+) + +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -664,6 +664,11 @@ static inline bool is_module_percpu_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; +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -734,6 +734,11 @@ bool is_module_percpu_address(unsigned l + return false; + } + ++bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr) ++{ ++ return false; ++} ++ + #endif /* CONFIG_SMP */ + + #define MODINFO_ATTR(field) \ diff --git a/patches/series b/patches/series index 79ba181156f9..83cfc023faa4 100644 --- a/patches/series +++ b/patches/series @@ -16,6 +16,7 @@ timer-make-the-base-lock-raw.patch # Stuff broken upstream, patches submitted ############################################################ lockdep-Handle-statically-initialized-PER_CPU-locks-.patch +lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch # Those two should vanish soon (not use PIT during bootup) at91_dont_enable_disable_clock.patch |