The following commit has been merged into the x86/entry branch of tip: Commit-ID: 74a4882d723a76cb3c72caf440ca5ef3f2bca6ab Gitweb: https://git.kernel.org/tip/74a4882d723a76cb3c72caf440ca5ef3f2bca6ab Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Sun, 08 Mar 2020 23:24:02 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Tue, 10 Mar 2020 13:56:32 +01:00 x86/entry/32: Remove unused label restore_nocheck Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Alexandre Chartre <alexandre.chartre@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200308222609.219366430@xxxxxxxxxxxxx --- arch/x86/entry/entry_32.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index ddc87f2..80df781 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -1091,7 +1091,7 @@ restore_all: TRACE_IRQS_IRET SWITCH_TO_ENTRY_STACK CHECK_AND_APPLY_ESPFIX -.Lrestore_nocheck: + /* Switch back to user CR3 */ SWITCH_TO_USER_CR3 scratch_reg=%eax
|