From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320AbdCHUbO (ORCPT ); Wed, 8 Mar 2017 15:31:14 -0500 Received: from mail.kernel.org ([198.145.29.136]:33580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751720AbdCHUbM (ORCPT ); Wed, 8 Mar 2017 15:31:12 -0500 Message-Id: <20170308203022.754839943@goodmis.org> User-Agent: quilt/0.63-1 Date: Wed, 08 Mar 2017 15:30:13 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-rt-users Cc: Thomas Gleixner , Carsten Emde , Sebastian Andrzej Siewior , John Kacur , Paul Gortmaker , Julia Cartwright , Dan Murphy Subject: [PATCH RT 6/7] lockdep: Fix compilation error for !CONFIG_MODULES and !CONFIG_SMP References: <20170308203007.731237400@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0006-lockdep-Fix-compilation-error-for-CONFIG_MODULES-and.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.10.105-rt120-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Murphy 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 [bigeasy: merge the two patches from Dan into one, adapt changelog] Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Steven Rostedt (VMware) --- 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