To avoid complications with ppc64, always use the ppc64 alignment.
v2: * Initial. Suggested by Segher Boessenkool.
Cc: Segher Boessenkool segher@kernel.crashing.org Cc: Alexander Graf agraf@suse.de Signed-off-by: Andreas Färber andreas.faerber@web.de --- arch/ppc/qemu/ofmem.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index afd5808..189dae3 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -389,14 +389,11 @@ setup_mmu( unsigned long ramsize ) ofmem_t *ofmem; unsigned long sdr1, sr_base, msr; unsigned long hash_base; - unsigned long hash_mask = 0xffff0000; + unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ int i;
/* SDR1: Storage Description Register 1 */
- if(is_ppc64()) - hash_mask = 0xfff00000; - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); sdr1 = hash_base | ((HASH_SIZE-1) >> 16);