[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157390576119.12247.2366713267971139294.tip-bot2@tip-bot2>
Date: Sat, 16 Nov 2019 12:02:41 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Peter Zijlstra <peterz@...radead.org>,
Thomas Gleixner <tglx@...utronix.de>,
Sean Christopherson <sean.j.christopherson@...el.com>,
Alexandre Chartre <alexandre.chartre@...cle.com>,
Ingo Molnar <mingo@...nel.org>, Borislav Petkov <bp@...en8.de>,
linux-kernel@...r.kernel.org
Subject: [tip: x86/asm] x86/entry/32: Remove unused resume_userspace label
The following commit has been merged into the x86/asm branch of tip:
Commit-ID: df1a7524741b6c094786032e12a21a448321d9f6
Gitweb: https://git.kernel.org/tip/df1a7524741b6c094786032e12a21a448321d9f6
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Wed, 23 Oct 2019 14:27:06 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Sat, 16 Nov 2019 12:55:55 +01:00
x86/entry/32: Remove unused resume_userspace label
The C reimplementation of SYSENTER left that unused ENTRY() label
around. Remove it.
Fixes: 5f310f739b4c ("x86/entry/32: Re-implement SYSENTER using the new C path")
Originally-by: Peter Zijlstra <peterz@...radead.org>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Sean Christopherson <sean.j.christopherson@...el.com>
Reviewed-by: Alexandre Chartre <alexandre.chartre@...cle.com>
Acked-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Link: https://lkml.kernel.org/r/20191023123117.686514045@linutronix.de
---
arch/x86/entry/entry_32.S | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index a987b62..4bbcc5e 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -824,7 +824,6 @@ ret_from_intr:
cmpl $USER_RPL, %eax
jb restore_all_kernel # not returning to v8086 or userspace
-SYM_INNER_LABEL_ALIGN(resume_userspace, SYM_L_LOCAL)
DISABLE_INTERRUPTS(CLBR_ANY)
TRACE_IRQS_OFF
movl %esp, %eax
Powered by blists - more mailing lists