diff options
Diffstat (limited to 'arch/arm/mm/proc-macros.S')
| -rw-r--r-- | arch/arm/mm/proc-macros.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 7d63beaf9745..337f10256cd6 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S | |||
| @@ -99,6 +99,10 @@ | |||
| 99 | * 110x 0 1 0 r/w r/o | 99 | * 110x 0 1 0 r/w r/o |
| 100 | * 11x0 0 1 0 r/w r/o | 100 | * 11x0 0 1 0 r/w r/o |
| 101 | * 1111 0 1 1 r/w r/w | 101 | * 1111 0 1 1 r/w r/w |
| 102 | * | ||
| 103 | * If !CONFIG_CPU_USE_DOMAINS, the following permissions are changed: | ||
| 104 | * 110x 1 1 1 r/o r/o | ||
| 105 | * 11x0 1 1 1 r/o r/o | ||
| 102 | */ | 106 | */ |
| 103 | .macro armv6_mt_table pfx | 107 | .macro armv6_mt_table pfx |
| 104 | \pfx\()_mt_table: | 108 | \pfx\()_mt_table: |
| @@ -138,8 +142,11 @@ | |||
| 138 | 142 | ||
| 139 | tst r1, #L_PTE_USER | 143 | tst r1, #L_PTE_USER |
| 140 | orrne r3, r3, #PTE_EXT_AP1 | 144 | orrne r3, r3, #PTE_EXT_AP1 |
| 145 | #ifdef CONFIG_CPU_USE_DOMAINS | ||
| 146 | @ allow kernel read/write access to read-only user pages | ||
| 141 | tstne r3, #PTE_EXT_APX | 147 | tstne r3, #PTE_EXT_APX |
| 142 | bicne r3, r3, #PTE_EXT_APX | PTE_EXT_AP0 | 148 | bicne r3, r3, #PTE_EXT_APX | PTE_EXT_AP0 |
| 149 | #endif | ||
| 143 | 150 | ||
| 144 | tst r1, #L_PTE_EXEC | 151 | tst r1, #L_PTE_EXEC |
| 145 | orreq r3, r3, #PTE_EXT_XN | 152 | orreq r3, r3, #PTE_EXT_XN |