diff options
author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 12:54:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 12:54:58 +0100 |
commit | 62137364e3e8afcc745846c5c67cacf943149073 (patch) | |
tree | 42f2bdee6b16e383b6e0a94cb3abc62f335d721a /arch/x86/kernel/sev-es-shared.c | |
parent | checkpatch: Don't check for mutex_trylock_recursive() (diff) | |
parent | Merge tag 'powerpc-5.11-8' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
download | linux-62137364e3e8afcc745846c5c67cacf943149073.tar.xz linux-62137364e3e8afcc745846c5c67cacf943149073.zip |
Merge branch 'linus' into locking/core, to pick up upstream fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/sev-es-shared.c')
-rw-r--r-- | arch/x86/kernel/sev-es-shared.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/sev-es-shared.c b/arch/x86/kernel/sev-es-shared.c index 7d04b356d44d..cdc04d091242 100644 --- a/arch/x86/kernel/sev-es-shared.c +++ b/arch/x86/kernel/sev-es-shared.c @@ -305,14 +305,14 @@ static enum es_result vc_ioio_exitinfo(struct es_em_ctxt *ctxt, u64 *exitinfo) case 0xe4: case 0xe5: *exitinfo |= IOIO_TYPE_IN; - *exitinfo |= (u64)insn->immediate.value << 16; + *exitinfo |= (u8)insn->immediate.value << 16; break; /* OUT immediate opcodes */ case 0xe6: case 0xe7: *exitinfo |= IOIO_TYPE_OUT; - *exitinfo |= (u64)insn->immediate.value << 16; + *exitinfo |= (u8)insn->immediate.value << 16; break; /* IN register opcodes */ |