|
@@ -1002,7 +1002,6 @@ ENTRY(error_entry)
|
|
testb $3, CS+8(%rsp)
|
|
testb $3, CS+8(%rsp)
|
|
jz .Lerror_kernelspace
|
|
jz .Lerror_kernelspace
|
|
|
|
|
|
-.Lerror_entry_from_usermode_swapgs:
|
|
|
|
/*
|
|
/*
|
|
* We entered from user mode or we're pretending to have entered
|
|
* We entered from user mode or we're pretending to have entered
|
|
* from user mode due to an IRET fault.
|
|
* from user mode due to an IRET fault.
|
|
@@ -1045,7 +1044,8 @@ ENTRY(error_entry)
|
|
* gsbase and proceed. We'll fix up the exception and land in
|
|
* gsbase and proceed. We'll fix up the exception and land in
|
|
* .Lgs_change's error handler with kernel gsbase.
|
|
* .Lgs_change's error handler with kernel gsbase.
|
|
*/
|
|
*/
|
|
- jmp .Lerror_entry_from_usermode_swapgs
|
|
|
|
|
|
+ SWAPGS
|
|
|
|
+ jmp .Lerror_entry_done
|
|
|
|
|
|
.Lbstep_iret:
|
|
.Lbstep_iret:
|
|
/* Fix truncated RIP */
|
|
/* Fix truncated RIP */
|