aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/head_fsl_booke.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 8942d7a82faf..2b5760580254 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -751,7 +751,7 @@ finish_tlb_load:
751 iseleq r12, r12, r10 751 iseleq r12, r12, r10
752 752
753#ifdef CONFIG_PTE_64BIT 753#ifdef CONFIG_PTE_64BIT
7542: rlwimi r12, r13, 24, 0, 7 /* grab RPN[32:39] */ 754 rlwimi r12, r13, 24, 0, 7 /* grab RPN[32:39] */
755 rlwimi r12, r11, 24, 8, 19 /* grab RPN[40:51] */ 755 rlwimi r12, r11, 24, 8, 19 /* grab RPN[40:51] */
756 mtspr SPRN_MAS3, r12 756 mtspr SPRN_MAS3, r12
757BEGIN_FTR_SECTION 757BEGIN_FTR_SECTION
@@ -759,7 +759,7 @@ BEGIN_FTR_SECTION
759 mtspr SPRN_MAS7, r10 759 mtspr SPRN_MAS7, r10
760END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS) 760END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS)
761#else 761#else
7622: rlwimi r11, r12, 0, 20, 31 /* Extract RPN from PTE and merge with perms */ 762 rlwimi r11, r12, 0, 20, 31 /* Extract RPN from PTE and merge with perms */
763 mtspr SPRN_MAS3, r11 763 mtspr SPRN_MAS3, r11
764#endif 764#endif
765#ifdef CONFIG_E200 765#ifdef CONFIG_E200