diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-23 11:10:35 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-10-23 11:10:35 -0400 |
| commit | b4404de35f6430a3aa2ce5ff3ce7e9927da3ce16 (patch) | |
| tree | 7f3d2e26c3765ff45b5211f2612d0ae0bb5010d1 | |
| parent | 051060f3065d9eb7d89cef3b66aedcd770ca174d (diff) | |
| download | 4.12-rt-patches-b4404de35f6430a3aa2ce5ff3ce7e9927da3ce16.tar.gz | |
lockdep: drop patch now with a similar one upstream
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch | 55 | ||||
| -rw-r--r-- | patches/series | 1 |
2 files changed, 0 insertions, 56 deletions
diff --git a/patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch b/patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch deleted file mode 100644 index d6385cee687e9..0000000000000 --- a/patches/lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 -@@ -661,6 +661,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 -@@ -739,6 +739,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 eed82549d7c47..6f3fef352ffad 100644 --- a/patches/series +++ b/patches/series @@ -14,7 +14,6 @@ timer-make-the-base-lock-raw.patch ############################################################ # Stuff broken upstream, patches submitted ############################################################ -lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch # a few patches from tip's sched/core sched-clock-Initialize-all-per-CPU-state-before-swit.patch |