diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:59:19 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 08:59:19 -0400 |
| commit | 2f540738f8d228016c6cd0d3b303896c174ecee3 (patch) | |
| tree | 7e6574c041ac4386763f94d3d401d70f4ab6f55b /arch/x86/kvm/emulate.c | |
| parent | a3849a4c038a21075a0bc7eaf37f65a93976d10c (diff) | |
| parent | d8e9c00e38f6947cef7f5466a0a3d369461ab97f (diff) | |
Merge branch 'tegra/cleanup' into next/cleanup
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 6f08bc940fa8..8b4cc5f067de 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
| @@ -3603,7 +3603,7 @@ done_prefixes: | |||
| 3603 | break; | 3603 | break; |
| 3604 | case Src2CL: | 3604 | case Src2CL: |
| 3605 | ctxt->src2.bytes = 1; | 3605 | ctxt->src2.bytes = 1; |
| 3606 | ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0x8; | 3606 | ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0xff; |
| 3607 | break; | 3607 | break; |
| 3608 | case Src2ImmByte: | 3608 | case Src2ImmByte: |
| 3609 | rc = decode_imm(ctxt, &ctxt->src2, 1, true); | 3609 | rc = decode_imm(ctxt, &ctxt->src2, 1, true); |