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 X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FC73C64E8A for ; Wed, 2 Dec 2020 14:13:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C12F221FA for ; Wed, 2 Dec 2020 14:13:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730251AbgLBOMp (ORCPT ); Wed, 2 Dec 2020 09:12:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728986AbgLBOMo (ORCPT ); Wed, 2 Dec 2020 09:12:44 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2A8EC0613D4; Wed, 2 Dec 2020 06:12:03 -0800 (PST) Date: Wed, 02 Dec 2020 14:12:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1606918322; 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=GOk8c/T+ua7VKqJwatAWz8PEJ5wH5Uiv4aj4CnDREAI=; b=xMWegTBzHAruwLCvaRcLlvwpRpIpNtfek2NQVYhbWgOXSV0WTj3hxYf2mjoCB0+WOKq3qg H2ehkiBZlQ7t+JAMd+vubIc9Hr2EugJxm6CYfyBgAg8Z1uDl8xGPonWtZzm9SUjGVtIWFl kPBhCGVoZalrIaKZJcNopVVwq8l/9Y+oYkdjXWBzy7+3a3f4ioTEWbjAox97kuIJFQ78eB HSsYU042I3EPJHOor0EiBEtPnunF4gOj3FB7sdcDc9e4+DVoEi+9oQ98CDkEjiMsq4Am1l T44tiAS240CUI6MYu/cFK/2RcOjtc2Owydz/rihiISBirdAwO+UmkerGxTXzng== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1606918322; 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=GOk8c/T+ua7VKqJwatAWz8PEJ5wH5Uiv4aj4CnDREAI=; b=wEKzwK1yel7KyVpZgMQWBOCa/NvXKZ0aNMIR0rD4tE47KkELEKco7XykFRMNDmKS08imtP wBNLfdZiVLGzc2DQ== From: "tip-bot2 for Sven Schnelle" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/entry] entry: Rename exit_to_user_mode() Cc: Sven Schnelle , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20201201142755.31931-3-svens@linux.ibm.com> References: <20201201142755.31931-3-svens@linux.ibm.com> MIME-Version: 1.0 Message-ID: <160691832213.3364.4766112716143844753.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 core/entry branch of tip: Commit-ID: bb793562f0da7317adf6c456316bca651ff46f5d Gitweb: https://git.kernel.org/tip/bb793562f0da7317adf6c456316bca651ff46f5d Author: Sven Schnelle AuthorDate: Tue, 01 Dec 2020 15:27:52 +01:00 Committer: Thomas Gleixner CommitterDate: Wed, 02 Dec 2020 15:07:57 +01:00 entry: Rename exit_to_user_mode() In order to make this function publicly available rename it so it can still be inlined. An additional exit_to_user_mode() function will be added with a later commit. Signed-off-by: Sven Schnelle Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20201201142755.31931-3-svens@linux.ibm.com --- kernel/entry/common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 8e294a7..dff07b4 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -122,7 +122,7 @@ noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs) } /** - * exit_to_user_mode - Fixup state when exiting to user mode + * __exit_to_user_mode - Fixup state when exiting to user mode * * Syscall/interupt exit enables interrupts, but the kernel state is * interrupts disabled when this is invoked. Also tell RCU about it. @@ -133,7 +133,7 @@ noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs) * mitigations, etc. * 4) Tell lockdep that interrupts are enabled */ -static __always_inline void exit_to_user_mode(void) +static __always_inline void __exit_to_user_mode(void) { instrumentation_begin(); trace_hardirqs_on_prepare(); @@ -299,7 +299,7 @@ __visible noinstr void syscall_exit_to_user_mode(struct pt_regs *regs) local_irq_disable_exit_to_user(); exit_to_user_mode_prepare(regs); instrumentation_end(); - exit_to_user_mode(); + __exit_to_user_mode(); } noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) @@ -312,7 +312,7 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) instrumentation_begin(); exit_to_user_mode_prepare(regs); instrumentation_end(); - exit_to_user_mode(); + __exit_to_user_mode(); } noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)