diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/head_44x.S | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index 656cfb2d6666..711368b993f2 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S | |||
@@ -497,7 +497,7 @@ tlb_44x_patch_hwater_D: | |||
497 | mtspr SPRN_MMUCR,r12 | 497 | mtspr SPRN_MMUCR,r12 |
498 | 498 | ||
499 | /* Make up the required permissions */ | 499 | /* Make up the required permissions */ |
500 | li r13,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_HWEXEC | 500 | li r13,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC |
501 | 501 | ||
502 | /* Compute pgdir/pmd offset */ | 502 | /* Compute pgdir/pmd offset */ |
503 | rlwinm r12, r10, PPC44x_PGD_OFF_SHIFT, PPC44x_PGD_OFF_MASK_BIT, 29 | 503 | rlwinm r12, r10, PPC44x_PGD_OFF_SHIFT, PPC44x_PGD_OFF_MASK_BIT, 29 |
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index eca80482ae72..2c5af5256479 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
@@ -643,7 +643,7 @@ interrupt_base: | |||
643 | 643 | ||
644 | 4: | 644 | 4: |
645 | /* Make up the required permissions */ | 645 | /* Make up the required permissions */ |
646 | li r13,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_HWEXEC | 646 | li r13,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC |
647 | 647 | ||
648 | FIND_PTE | 648 | FIND_PTE |
649 | andc. r13,r13,r11 /* Check permission */ | 649 | andc. r13,r13,r11 /* Check permission */ |
@@ -742,7 +742,7 @@ finish_tlb_load: | |||
742 | #endif | 742 | #endif |
743 | mtspr SPRN_MAS2, r12 | 743 | mtspr SPRN_MAS2, r12 |
744 | 744 | ||
745 | li r10, (_PAGE_HWEXEC | _PAGE_PRESENT) | 745 | li r10, (_PAGE_EXEC | _PAGE_PRESENT) |
746 | rlwimi r10, r11, 31, 29, 29 /* extract _PAGE_DIRTY into SW */ | 746 | rlwimi r10, r11, 31, 29, 29 /* extract _PAGE_DIRTY into SW */ |
747 | and r12, r11, r10 | 747 | and r12, r11, r10 |
748 | andi. r10, r11, _PAGE_USER /* Test for _PAGE_USER */ | 748 | andi. r10, r11, _PAGE_USER /* Test for _PAGE_USER */ |