powerpc/8xx: use modify_instruction_site()
authorChristophe Leroy <christophe.leroy@c-s.fr>
Fri, 9 Nov 2018 17:33:26 +0000 (17:33 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 19 Dec 2018 07:56:32 +0000 (18:56 +1100)
Instead of hardcoding the TLB handlers patching, use
the newly created modify_instruction_site() helper.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/mm/8xx_mmu.c

index e2b6687ebb50228d7db83b05781f523e61d7e17f..bfa503cff35114b72bcee40c32365c17af935696 100644 (file)
@@ -100,11 +100,7 @@ static void __init mmu_mapin_immr(void)
 
 static void __init mmu_patch_cmp_limit(s32 *site, unsigned long mapped)
 {
-       unsigned int instr = *(unsigned int *)patch_site_addr(site);
-
-       instr &= 0xffff0000;
-       instr |= (unsigned long)__va(mapped) >> 16;
-       patch_instruction_site(site, instr);
+       modify_instruction_site(site, 0xffff, (unsigned long)__va(mapped) >> 16);
 }
 
 unsigned long __init mmu_mapin_ram(unsigned long top)