Revert "x86/entry_32: Clear CPU buffers after register restore in NMI return"
This reverts commit 0c7e61432d
.
This commit is contained in:
parent
a91e7ad42f
commit
5e83655d80
1 changed files with 1 additions and 2 deletions
|
@ -1222,6 +1222,7 @@ SYM_CODE_START(asm_exc_nmi)
|
|||
|
||||
/* Not on SYSENTER stack. */
|
||||
call exc_nmi
|
||||
CLEAR_CPU_BUFFERS
|
||||
jmp .Lnmi_return
|
||||
|
||||
.Lnmi_from_sysenter_stack:
|
||||
|
@ -1242,7 +1243,6 @@ SYM_CODE_START(asm_exc_nmi)
|
|||
|
||||
CHECK_AND_APPLY_ESPFIX
|
||||
RESTORE_ALL_NMI cr3_reg=%edi pop=4
|
||||
CLEAR_CPU_BUFFERS
|
||||
jmp .Lirq_return
|
||||
|
||||
#ifdef CONFIG_X86_ESPFIX32
|
||||
|
@ -1284,7 +1284,6 @@ SYM_CODE_START(asm_exc_nmi)
|
|||
* 1 - orig_ax
|
||||
*/
|
||||
lss (1+5+6)*4(%esp), %esp # back to espfix stack
|
||||
CLEAR_CPU_BUFFERS
|
||||
jmp .Lirq_return
|
||||
#endif
|
||||
SYM_CODE_END(asm_exc_nmi)
|
||||
|
|
Loading…
Reference in a new issue