diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-08 22:31:27 +0400 |
| commit | 79dbf9d1a443fc015e05dbeb5ab610059c6d9bf1 (patch) | |
| tree | 044b23d8cb4827763dc0728dbaa76c4cd0eb7ac2 /arch/x86/kvm/emulate.c | |
| parent | de507154419bcaf3c135b94ba3bbb3f3a6464447 (diff) | |
| parent | c554f06fc801004f3fc3b162c490d8fdf4e79725 (diff) | |
Merge branch 'tracking-linux-3.9.y' into merge-linux-linaro-core-trackingllct-20130508.0
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index a335cc6cde72..a9c9d3e48370 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -4162,6 +4162,10 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, break; case OpMem8: ctxt->memop.bytes = 1; + if (ctxt->memop.type == OP_REG) { + ctxt->memop.addr.reg = decode_register(ctxt, ctxt->modrm_rm, 1); + fetch_register_operand(&ctxt->memop); + } goto mem_common; case OpMem16: ctxt->memop.bytes = 2; |