diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-03-26 09:03:16 (GMT) |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-03-26 09:04:28 (GMT) |
| commit | df60f57684529a1dde4461cf84354453b440806a (patch) | |
| tree | 618f030f673980a4c9d6bf27c1db50459a3b99d1 /arch/powerpc/mm | |
| parent | 605f30205348f1d808d98d77505149da8b047b9f (diff) | |
| parent | b921e90260cec1e04988bb3763491de885b67b51 (diff) | |
| download | linux-df60f57684529a1dde4461cf84354453b440806a.tar.xz | |
Merge branch 'next-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into test
Merge miscellaneous bits from benh. Fix a minor conflict with
OpalMessageType changing names to opal_msg_type.
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/ppc_mmu_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c index 5029dc1..eb0e489 100644 --- a/arch/powerpc/mm/ppc_mmu_32.c +++ b/arch/powerpc/mm/ppc_mmu_32.c @@ -224,7 +224,7 @@ void __init MMU_init_hw(void) */ if ( ppc_md.progress ) ppc_md.progress("hash:find piece", 0x322); Hash = __va(memblock_alloc(Hash_size, Hash_size)); - cacheable_memzero(Hash, Hash_size); + memset(Hash, 0, Hash_size); _SDR1 = __pa(Hash) | SDR1_LOW_BITS; Hash_end = (struct hash_pte *) ((unsigned long)Hash + Hash_size); |