diff options
| author | Dave Hansen <dave.hansen@linux.intel.com> | 2024-03-12 07:27:57 -0700 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@linux.intel.com> | 2024-03-12 08:33:51 -0700 |
| commit | 532a0c57d7ff75e8f07d4e25cba4184989e2a241 (patch) | |
| tree | e1c5c1e7751821b9729fffe74a00ee676003cb3c | |
| parent | f0551af021308a2a1163dc63d1f1bba3594208bd (diff) | |
| download | linux-fs-532a0c57d7ff75e8f07d4e25cba4184989e2a241.tar.gz | |
Revert "x86/bugs: Use fixed addressing for VERW operand"
This was reverts commit 8009479ee919b9a91674f48050ccbff64eafedaa.
It was originally in x86/urgent, but was deemed wrong so got zapped.
But in the meantime, x86/urgent had been merged into x86/apic to
resolve a conflict. I didn't notice the merge so didn't zap it
from x86/apic and it managed to make it up with the x86/apic
material.
The reverted commit is known to cause some KASAN problems.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
| -rw-r--r-- | arch/x86/include/asm/nospec-branch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index ab19c7f1167bad..2aa52cab1e463a 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -323,7 +323,7 @@ * Note: Only the memory operand variant of VERW clears the CPU buffers. */ .macro CLEAR_CPU_BUFFERS - ALTERNATIVE "", __stringify(verw mds_verw_sel), X86_FEATURE_CLEAR_CPU_BUF + ALTERNATIVE "", __stringify(verw _ASM_RIP(mds_verw_sel)), X86_FEATURE_CLEAR_CPU_BUF .endm #else /* __ASSEMBLY__ */ |