diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /drivers/kvm/x86_emulate.c | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/kvm/x86_emulate.c')
| -rw-r--r-- | drivers/kvm/x86_emulate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c index 1f979cb0df31..4b8a0cc9665e 100644 --- a/drivers/kvm/x86_emulate.c +++ b/drivers/kvm/x86_emulate.c | |||
| @@ -1217,11 +1217,13 @@ twobyte_insn: | |||
| 1217 | } | 1217 | } |
| 1218 | break; | 1218 | break; |
| 1219 | case 0x21: /* mov from dr to reg */ | 1219 | case 0x21: /* mov from dr to reg */ |
| 1220 | no_wb = 1; | ||
| 1220 | if (modrm_mod != 3) | 1221 | if (modrm_mod != 3) |
| 1221 | goto cannot_emulate; | 1222 | goto cannot_emulate; |
| 1222 | rc = emulator_get_dr(ctxt, modrm_reg, &_regs[modrm_rm]); | 1223 | rc = emulator_get_dr(ctxt, modrm_reg, &_regs[modrm_rm]); |
| 1223 | break; | 1224 | break; |
| 1224 | case 0x23: /* mov from reg to dr */ | 1225 | case 0x23: /* mov from reg to dr */ |
| 1226 | no_wb = 1; | ||
| 1225 | if (modrm_mod != 3) | 1227 | if (modrm_mod != 3) |
| 1226 | goto cannot_emulate; | 1228 | goto cannot_emulate; |
| 1227 | rc = emulator_set_dr(ctxt, modrm_reg, _regs[modrm_rm]); | 1229 | rc = emulator_set_dr(ctxt, modrm_reg, _regs[modrm_rm]); |