From 072e8ddcf859c74dd166b579f0be426e619292f1 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Sun, 19 Apr 2020 14:40:47 +0000 Subject: [PATCH 2643/2944] x86/entry/64: Remove unneeded kernel CR3 switching to #30648216 commit c75890700455113c366f795f3d22ee03623835e8 upstream When native_load_gs_index() fails on .Lgs_change, CR3 must be kernel CR3. No need to switch it. Signed-off-by: Lai Jiangshan Signed-off-by: Thomas Gleixner Link: https://lkml.kernel.org/r/20200419144049.1906-2-laijs@linux.alibaba.com Signed-off-by: Ethan Zhao Signed-off-by: Zelin Deng Reviewed-by: Artie Ding --- arch/x86/entry/entry_64.S | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 8c661d26..969b49c 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1414,7 +1414,6 @@ ENTRY(error_entry) */ SWAPGS FENCE_SWAPGS_USER_ENTRY - SWITCH_TO_KERNEL_CR3 scratch_reg=%rax jmp .Lerror_entry_done .Lbstep_iret: -- 1.8.3.1