x86/entry/64: Use JMP instead of JMPQ
authorJosh Poimboeuf <jpoimboe@redhat.com>
Mon, 15 Jul 2019 16:51:39 +0000 (11:51 -0500)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 17 Jul 2019 13:37:14 +0000 (15:37 +0200)
commit64dbc122b20f75183d8822618c24f85144a5a94d
tree49399e44a25bed365000cf7ae9af240db1065350
parenta2059825986a1c8143fd6698774fa9d83733bb11
x86/entry/64: Use JMP instead of JMPQ

Somehow the swapgs mitigation entry code patch ended up with a JMPQ
instruction instead of JMP, where only the short jump is needed.  Some
assembler versions apparently fail to optimize JMPQ into a two-byte JMP
when possible, instead always using a 7-byte JMP with relocation.  For
some reason that makes the entry code explode with a #GP during boot.

Change it back to "JMP" as originally intended.

Fixes: 18ec54fdd6d1 ("x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations")
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/entry/entry_64.S