diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 19:05:13 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 19:05:13 +0000 |
| commit | f71e769d0754dc9a593a9e17ec6693a261b29f82 (patch) | |
| tree | e133875b655d07888128cb695f42299e6acdba5d | |
| parent | ec864874bd1c1e13c82f4096fd3957d26c70a680 (diff) | |
| parent | c01a71c1a56fa27f43449ff59e5d03b2483658a2 (diff) | |
| download | focaccia-qemu-f71e769d0754dc9a593a9e17ec6693a261b29f82.tar.gz focaccia-qemu-f71e769d0754dc9a593a9e17ec6693a261b29f82.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging
QOM CPUState refactorings / X86CPU * Fix pointer type mismatch # gpg: Signature made Wed 19 Mar 2014 18:51:47 GMT using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber <afaerber@suse.de>" # gpg: aka "Andreas Färber <afaerber@suse.com>" * remotes/afaerber/tags/qom-cpu-for-2.0: exec: Fix CPU rework fallout Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/exec.c b/exec.c index 6a0bc94a0a..91513c6c43 100644 --- a/exec.c +++ b/exec.c @@ -420,7 +420,7 @@ static int cpu_common_post_load(void *opaque, int version_id) /* 0x01 was CPU_INTERRUPT_EXIT. This line can be removed when the version_id is increased. */ cpu->interrupt_request &= ~0x01; - tlb_flush(cpu->env_ptr, 1); + tlb_flush(cpu, 1); return 0; } |