aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2013-04-28 05:37:27 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-30 01:59:46 -0400
commitcc3665a60a4ff072f5b5b18312bdf9b6612c5814 (patch)
tree017bcd677a8e0e5a7f7766b0c6ba471e00370ac2 /arch/powerpc/mm
parentce54152f429ed5e6ad83e5e9f61825b5a795dd1e (diff)
powerpc: Don't hard code the size of pte page
USE PTRS_PER_PTE to indicate the size of pte page. To support THP, later patches will be changing PTRS_PER_PTE value. Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/hash_low_64.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S
index 7443481a315c..abdd5e21cdb6 100644
--- a/arch/powerpc/mm/hash_low_64.S
+++ b/arch/powerpc/mm/hash_low_64.S
@@ -490,7 +490,7 @@ END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE)
490 beq htab_inval_old_hpte 490 beq htab_inval_old_hpte
491 491
492 ld r6,STK_PARAM(R6)(r1) 492 ld r6,STK_PARAM(R6)(r1)
493 ori r26,r6,0x8000 /* Load the hidx mask */ 493 ori r26,r6,PTE_PAGE_HIDX_OFFSET /* Load the hidx mask. */
494 ld r26,0(r26) 494 ld r26,0(r26)
495 addi r5,r25,36 /* Check actual HPTE_SUB bit, this */ 495 addi r5,r25,36 /* Check actual HPTE_SUB bit, this */
496 rldcr. r0,r31,r5,0 /* must match pgtable.h definition */ 496 rldcr. r0,r31,r5,0 /* must match pgtable.h definition */
@@ -607,7 +607,7 @@ htab_pte_insert_ok:
607 sld r4,r4,r5 607 sld r4,r4,r5
608 andc r26,r26,r4 608 andc r26,r26,r4
609 or r26,r26,r3 609 or r26,r26,r3
610 ori r5,r6,0x8000 610 ori r5,r6,PTE_PAGE_HIDX_OFFSET
611 std r26,0(r5) 611 std r26,0(r5)
612 lwsync 612 lwsync
613 std r30,0(r6) 613 std r30,0(r6)