diff options
| author | Peter Maydell | 2014-07-08 12:38:12 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-07-08 12:38:12 +0200 |
| commit | eaa4980185943da6e36f6f2e052d41924705e1ea (patch) | |
| tree | bbe6af7da0d5c6371828225df193449eec1b82ce /target-ppc/mmu_helper.c | |
| parent | Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.1' into staging (diff) | |
| parent | PPC: e500: Actually install u-boot.e500 (diff) | |
| download | qemu-eaa4980185943da6e36f6f2e052d41924705e1ea.tar.gz qemu-eaa4980185943da6e36f6f2e052d41924705e1ea.tar.xz qemu-eaa4980185943da6e36f6f2e052d41924705e1ea.zip | |
Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging
Patch queue for ppc - 2014-07-08
A few bug fixes for 2.1:
- Fix e500* TLB emulation with qemu-system-ppc
- Update SLOF to current upstream (good number of bugfixes)
- Make POWER7 / POWER8 PVR match more agnostic (needed in 2.1 for cmdline compat)
- Fix u-boot.e500 install (how did that happen?)
- Fix H_CAS on LE hosts
- ppc64le-linux-user fixes
# gpg: Signature made Tue 08 Jul 2014 11:18:58 BST using RSA key ID 03FEDC60
# gpg: Can't check signature: public key not found
* remotes/agraf/tags/signed-ppc-for-upstream:
PPC: e500: Actually install u-boot.e500
target-ppc: Remove POWER7+ and POWER8E families
target-ppc: Add pvr_match() callback
pseries: Update SLOF firmware image to qemu-slof-20140630
PPC: Fix booke206 TLB with phys addrs > 32bit
target-ppc: Fix gdbstub for ppc64le-linux-user
target-ppc: Change default cpu for ppc64le-linux-user
target-ppc: KVMPPC_H_CAS fix cpu-version endianess
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-ppc/mmu_helper.c')
| -rw-r--r-- | target-ppc/mmu_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 4d6b1e20c0..4a34a73ad4 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -897,10 +897,10 @@ static hwaddr booke206_tlb_to_page_size(CPUPPCState *env, /* TLB check function for MAS based SoftTLBs */ static int ppcmas_tlb_check(CPUPPCState *env, ppcmas_tlb_t *tlb, - hwaddr *raddrp, - target_ulong address, uint32_t pid) + hwaddr *raddrp, target_ulong address, + uint32_t pid) { - target_ulong mask; + hwaddr mask; uint32_t tlb_pid; if (!msr_cm) { |