OSDN Git Service

Merge remote-tracking branch 'remotes/stsquad/tags/pull-tcg-common-tlb-reset-20170113...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 16 Jan 2017 18:23:02 +0000 (18:23 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 16 Jan 2017 18:23:02 +0000 (18:23 +0000)
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>
1  2 
target/arm/helper.c
target/i386/cpu.c
target/m68k/cpu.h
target/ppc/translate_init.c

Simple merge
Simple merge
Simple merge
Simple merge