From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 226B8C433F5 for ; Mon, 30 May 2022 10:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235247AbiE3Ki7 (ORCPT ); Mon, 30 May 2022 06:38:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233486AbiE3Kiv (ORCPT ); Mon, 30 May 2022 06:38:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A90BC6B024; Mon, 30 May 2022 03:38:50 -0700 (PDT) Date: Mon, 30 May 2022 10:38:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1653907128; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ufDnFMnnXBqzc5K3MvijCT7r3uQmHklKS0W/nXF0apA=; b=eKCsbOTSBFO3tNIIUqGu0TgSqb16bl9Azav5AsnQpcV7M++y7nL8f7AWmUICSC+H7wWZqX jbxlnKCu6Pw6ySZnwRvmRyGqXm2tq0cZHTom/JsiZ0LABexsF+P2b1VEvKSgPnd88oTe5e 9Lg4sAxQpl1Vrj/H4d2zr5l0AlYGSWvrw+7kygr6eBerv/9I5WQPypPhDt1+i48EGpHarX HxsEeuO0uBQDEz1tTHmMMvumLnDOhpTA0EP2JW21tp6qALS0E7HkbuAwG4m6J+QfHA+Pnu SON8/pqexro1A+Uw+kNOxTqDl/Gt0cYMkWTf0gXRE8kRqvZaUTNxewRAqf/36g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1653907128; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ufDnFMnnXBqzc5K3MvijCT7r3uQmHklKS0W/nXF0apA=; b=XMJDFjPTforWFbcukIdOfeoLkQe405AmjyghiTNjVDb2HHjqlx9Sy2vyzFyas7J8lzV7PN pR/t0LzEHQAwPmCQ== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/urgent] context_tracking: Always inline empty stubs Cc: "Peter Zijlstra (Intel)" , Mark Rutland , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220526105958.134113388@infradead.org> References: <20220526105958.134113388@infradead.org> MIME-Version: 1.0 Message-ID: <165390712760.4207.5469965396434048789.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the objtool/urgent branch of tip: Commit-ID: 620f8d3bd3d5e82dff8cc591c831827d4beeae2e Gitweb: https://git.kernel.org/tip/620f8d3bd3d5e82dff8cc591c831827d4beeae2e Author: Peter Zijlstra AuthorDate: Sat, 07 May 2022 13:35:37 +02:00 Committer: Peter Zijlstra CommitterDate: Fri, 27 May 2022 12:34:44 +02:00 context_tracking: Always inline empty stubs Because GCC is seriously challenged.. vmlinux.o: warning: objtool: enter_from_user_mode+0x85: call to context_tracking_enabled() leaves .noinstr.text section vmlinux.o: warning: objtool: syscall_enter_from_user_mode+0x8f: call to context_tracking_enabled() leaves .noinstr.text section vmlinux.o: warning: objtool: syscall_enter_from_user_mode_prepare+0x85: call to context_tracking_enabled() leaves .noinstr.text section vmlinux.o: warning: objtool: irqentry_enter_from_user_mode+0x85: call to context_tracking_enabled() leaves .noinstr.text section Signed-off-by: Peter Zijlstra (Intel) Acked-by: Mark Rutland Link: https://lkml.kernel.org/r/20220526105958.134113388@infradead.org --- include/linux/context_tracking_state.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/context_tracking_state.h b/include/linux/context_tracking_state.h index 65a60d3..ae1e63e 100644 --- a/include/linux/context_tracking_state.h +++ b/include/linux/context_tracking_state.h @@ -46,10 +46,10 @@ static __always_inline bool context_tracking_in_user(void) return __this_cpu_read(context_tracking.state) == CONTEXT_USER; } #else -static inline bool context_tracking_in_user(void) { return false; } -static inline bool context_tracking_enabled(void) { return false; } -static inline bool context_tracking_enabled_cpu(int cpu) { return false; } -static inline bool context_tracking_enabled_this_cpu(void) { return false; } +static __always_inline bool context_tracking_in_user(void) { return false; } +static __always_inline bool context_tracking_enabled(void) { return false; } +static __always_inline bool context_tracking_enabled_cpu(int cpu) { return false; } +static __always_inline bool context_tracking_enabled_this_cpu(void) { return false; } #endif /* CONFIG_CONTEXT_TRACKING */ #endif