projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 26fa126)
x86/entry/64: Remove unneeded kernel CR3 switching
authorLai Jiangshan <laijs@linux.alibaba.com>
Sun, 19 Apr 2020 14:40:47 +0000 (14:40 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 11 Jun 2020 13:14:31 +0000 (15:14 +0200)
When native_load_gs_index() fails on .Lgs_change, CR3 must be kernel
CR3. No need to switch it.

Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200419144049.1906-2-laijs@linux.alibaba.com
arch/x86/entry/entry_64.S patch | blob | history

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 609c71e3dba1fd9367e57e70a53791d9186aec1f..87ffa792bc99ee0f968d1c2ddedd8f3c3699b863 100644 (file)
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -1334,7 +1334,6 @@ SYM_CODE_START_LOCAL(error_entry)
         */
        SWAPGS
        FENCE_SWAPGS_USER_ENTRY
-       SWITCH_TO_KERNEL_CR3 scratch_reg=%rax
        jmp .Lerror_entry_done
 
 .Lbstep_iret:
Domain: System / Kernel;