diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-16 18:23:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-16 18:23:02 +0000 |
| commit | a8c611e1133f97c979922f41103f79309339dc27 (patch) | |
| tree | 73d1c11a4e395d2d71a4c6a5b77018986f8613d8 /target/alpha | |
| parent | 2ccede18bd24fce5db83fef3674563a1f256717b (diff) | |
| parent | d10eb08f5d8389c814b554d01aa2882ac58221bf (diff) | |
| download | qemu-a8c611e1133f97c979922f41103f79309339dc27.zip qemu-a8c611e1133f97c979922f41103f79309339dc27.tar.gz qemu-a8c611e1133f97c979922f41103f79309339dc27.tar.bz2 | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-tcg-common-tlb-reset-20170113-r1' into staging
This is the same as the v3 posted except a re-base and a few extra signoffs
# gpg: Signature made Fri 13 Jan 2017 14:26:46 GMT
# gpg: using RSA key 0xFBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-tcg-common-tlb-reset-20170113-r1:
cputlb: drop flush_global flag from tlb_flush
cpu_common_reset: wrap TCG specific code in tcg_enabled()
qom/cpu: move tlb_flush to cpu_common_reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/alpha')
| -rw-r--r-- | target/alpha/cpu.c | 2 | ||||
| -rw-r--r-- | target/alpha/sys_helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 30d77ce..b4f9798 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -273,7 +273,7 @@ static void alpha_cpu_initfn(Object *obj) CPUAlphaState *env = &cpu->env; cs->env_ptr = env; - tlb_flush(cs, 1); + tlb_flush(cs); alpha_translate_init(); diff --git a/target/alpha/sys_helper.c b/target/alpha/sys_helper.c index bec1e17..652195d 100644 --- a/target/alpha/sys_helper.c +++ b/target/alpha/sys_helper.c @@ -44,7 +44,7 @@ uint64_t helper_load_pcc(CPUAlphaState *env) #ifndef CONFIG_USER_ONLY void helper_tbia(CPUAlphaState *env) { - tlb_flush(CPU(alpha_env_get_cpu(env)), 1); + tlb_flush(CPU(alpha_env_get_cpu(env))); } void helper_tbis(CPUAlphaState *env, uint64_t p) |