diff options
author | Jani Nikula <jani.nikula@intel.com> | 2022-04-26 16:44:31 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2022-04-26 16:44:31 +0300 |
commit | 3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24 (patch) | |
tree | debfb201936d9f81837f74ac6f3cb763ea428b72 /arch/x86/kernel | |
parent | f08699ec5bd924be4c9572e21fd0a806d3fb34c2 (diff) | |
parent | 19df0cfa258cd42f7f106f6085f1e625f26283db (diff) | |
download | linux-stable-3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24.tar.gz linux-stable-3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24.tar.bz2 linux-stable-3e8d34ed49ccfdbfad0dc46b9e1e4a278c10fd24.zip |
Merge drm/drm-next into drm-intel-next
Need to bring commit d8bb92e70a43 ("drm/dp: Factor out a function to
probe a DPCD address") back as a dependency to further work in
drm-intel-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/static_call.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/static_call.c b/arch/x86/kernel/static_call.c index 531fb4cbb63f..aa72cefdd5be 100644 --- a/arch/x86/kernel/static_call.c +++ b/arch/x86/kernel/static_call.c @@ -12,10 +12,9 @@ enum insn_type { }; /* - * data16 data16 xorq %rax, %rax - a single 5 byte instruction that clears %rax - * The REX.W cancels the effect of any data16. + * cs cs cs xorl %eax, %eax - a single 5 byte instruction that clears %[er]ax */ -static const u8 xor5rax[] = { 0x66, 0x66, 0x48, 0x31, 0xc0 }; +static const u8 xor5rax[] = { 0x2e, 0x2e, 0x2e, 0x31, 0xc0 }; static const u8 retinsn[] = { RET_INSN_OPCODE, 0xcc, 0xcc, 0xcc, 0xcc }; |