aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/entry/entry_64.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/entry/entry_64.S')
-rw-r--r--arch/x86/entry/entry_64.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 80ab68a42621..fee1d95902b5 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -1077,7 +1077,6 @@ ENTRY(error_entry)
1077 testb $3, CS+8(%rsp) 1077 testb $3, CS+8(%rsp)
1078 jz .Lerror_kernelspace 1078 jz .Lerror_kernelspace
1079 1079
1080.Lerror_entry_from_usermode_swapgs:
1081 /* 1080 /*
1082 * We entered from user mode or we're pretending to have entered 1081 * We entered from user mode or we're pretending to have entered
1083 * from user mode due to an IRET fault. 1082 * from user mode due to an IRET fault.
@@ -1120,7 +1119,8 @@ ENTRY(error_entry)
1120 * gsbase and proceed. We'll fix up the exception and land in 1119 * gsbase and proceed. We'll fix up the exception and land in
1121 * .Lgs_change's error handler with kernel gsbase. 1120 * .Lgs_change's error handler with kernel gsbase.
1122 */ 1121 */
1123 jmp .Lerror_entry_from_usermode_swapgs 1122 SWAPGS
1123 jmp .Lerror_entry_done
1124 1124
1125.Lbstep_iret: 1125.Lbstep_iret:
1126 /* Fix truncated RIP */ 1126 /* Fix truncated RIP */