| Message ID | 1455840984-24068-3-git-send-email-mikey@neuling.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, 2016-19-02 at 00:16:23 UTC, Michael Neuling wrote: > Use defines for literals __init_tlb_power[78] rather than hand coding > them. > > Signed-off-by: Michael Neuling <mikey@neuling.org> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/15b1624b78075d4f52e170600c cheers
diff --git a/arch/powerpc/kernel/cpu_setup_power.S b/arch/powerpc/kernel/cpu_setup_power.S index 9c9b741..cb3e272 100644 --- a/arch/powerpc/kernel/cpu_setup_power.S +++ b/arch/powerpc/kernel/cpu_setup_power.S @@ -15,6 +15,7 @@ #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> #include <asm/cache.h> +#include <asm/mmu-hash64.h> /* Entry: r3 = crap, r4 = ptr to cputable entry * @@ -139,7 +140,7 @@ __init_HFSCR: * (invalidate by congruence class). P7 has 128 CCs., P8 has 512. */ __init_tlb_power7: - li r6,128 + li r6,POWER7_TLB_SETS mtctr r6 li r7,0xc00 /* IS field = 0b11 */ ptesync @@ -150,7 +151,7 @@ __init_tlb_power7: 1: blr __init_tlb_power8: - li r6,512 + li r6,POWER8_TLB_SETS mtctr r6 li r7,0xc00 /* IS field = 0b11 */ ptesync
Use defines for literals __init_tlb_power[78] rather than hand coding them. Signed-off-by: Michael Neuling <mikey@neuling.org> --- arch/powerpc/kernel/cpu_setup_power.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)