From 2101b3281dc5eb55359e05f70d6559ca59ea7b93 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 31 Aug 2005 14:34:05 +1000 Subject: [PATCH] --- yaml --- r: 6617 b: refs/heads/master c: 319e76a1ae835c34a2838c2bfebe3db4d5a6b387 h: refs/heads/master i: 6615: 1a9a736a5d1bd7e9b09685d7e13de4198dd6cd6e v: v3 --- [refs] | 2 +- trunk/arch/ppc64/mm/slb_low.S | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 955fbeae4bbd..5a661028c873 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7eaa414ee86cda4c153002ed218b9a0ad17f7de1 +refs/heads/master: 319e76a1ae835c34a2838c2bfebe3db4d5a6b387 diff --git a/trunk/arch/ppc64/mm/slb_low.S b/trunk/arch/ppc64/mm/slb_low.S index bab255889c58..698d6b9ed6d1 100644 --- a/trunk/arch/ppc64/mm/slb_low.S +++ b/trunk/arch/ppc64/mm/slb_low.S @@ -97,25 +97,21 @@ BEGIN_FTR_SECTION lhz r9,PACAHIGHHTLBAREAS(r13) srdi r11,r3,(HTLB_AREA_SHIFT-SID_SHIFT) srd r9,r9,r11 - andi. r9,r9,1 - bne 5f + lhz r11,PACALOWHTLBAREAS(r13) + srd r11,r11,r3 + or r9,r9,r11 +END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE) +#endif /* CONFIG_HUGETLB_PAGE */ li r11,SLB_VSID_USER - cmpldi r3,16 - bge 6f - - lhz r9,PACALOWHTLBAREAS(r13) - srd r9,r9,r3 - andi. r9,r9,1 - - beq 6f - -5: li r11,SLB_VSID_USER|SLB_VSID_L +#ifdef CONFIG_HUGETLB_PAGE +BEGIN_FTR_SECTION + rldimi r11,r9,8,55 /* shift masked bit into SLB_VSID_L */ END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE) #endif /* CONFIG_HUGETLB_PAGE */ -6: ld r9,PACACONTEXTID(r13) + ld r9,PACACONTEXTID(r13) rldimi r3,r9,USER_ESID_BITS,0 9: /* r3 = protovsid, r11 = flags, r10 = esid_data, cr7 = <>KERNELBASE */