|
|
@@ -781,7 +781,7 @@ ENTRY(native_load_gs_index)
|
|
|
pushfq
|
|
|
DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI)
|
|
|
SWAPGS
|
|
|
-gs_change:
|
|
|
+.Lgs_change:
|
|
|
movl %edi, %gs
|
|
|
2: ALTERNATIVE "", "mfence", X86_BUG_SWAPGS_FENCE
|
|
|
SWAPGS
|
|
|
@@ -789,7 +789,7 @@ gs_change:
|
|
|
ret
|
|
|
END(native_load_gs_index)
|
|
|
|
|
|
- _ASM_EXTABLE(gs_change, bad_gs)
|
|
|
+ _ASM_EXTABLE(.Lgs_change, bad_gs)
|
|
|
.section .fixup, "ax"
|
|
|
/* running with kernelgs */
|
|
|
bad_gs:
|
|
|
@@ -1019,13 +1019,13 @@ ENTRY(error_entry)
|
|
|
movl %ecx, %eax /* zero extend */
|
|
|
cmpq %rax, RIP+8(%rsp)
|
|
|
je .Lbstep_iret
|
|
|
- cmpq $gs_change, RIP+8(%rsp)
|
|
|
+ cmpq $.Lgs_change, RIP+8(%rsp)
|
|
|
jne .Lerror_entry_done
|
|
|
|
|
|
/*
|
|
|
- * hack: gs_change can fail with user gsbase. If this happens, fix up
|
|
|
+ * hack: .Lgs_change can fail with user gsbase. If this happens, fix up
|
|
|
* gsbase and proceed. We'll fix up the exception and land in
|
|
|
- * gs_change's error handler with kernel gsbase.
|
|
|
+ * .Lgs_change's error handler with kernel gsbase.
|
|
|
*/
|
|
|
jmp .Lerror_entry_from_usermode_swapgs
|
|
|
|