diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-15 19:23:31 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 06:05:35 -0500 |
commit | 9522d7e4cb5e0858122fc55d33a2c07728f0b10d (patch) | |
tree | 49438ddcd5217da82cf9ebe79dda8577bc346456 /arch/arm/mm/mmu.c | |
parent | e926f4495e202500a6265987277fab217e235f08 (diff) |
ARM: pgtable: invert L_PTE_EXEC to L_PTE_XN
The hardware page tables use an XN bit 'execute never'. Historically,
we've had a Linux 'execute allow' bit, in the positive sense. Get rid
of this artifact as future hardware will continue to have the XN sense.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/mmu.c')
-rw-r--r-- | arch/arm/mm/mmu.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index bd1a11e62f4e..bd5a94b2d610 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -190,7 +190,7 @@ void adjust_cr(unsigned long mask, unsigned long set) | |||
190 | } | 190 | } |
191 | #endif | 191 | #endif |
192 | 192 | ||
193 | #define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_WRITE | 193 | #define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_WRITE|L_PTE_XN |
194 | #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE | 194 | #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE |
195 | 195 | ||
196 | static struct mem_type mem_types[] = { | 196 | static struct mem_type mem_types[] = { |
@@ -234,20 +234,19 @@ static struct mem_type mem_types[] = { | |||
234 | .domain = DOMAIN_KERNEL, | 234 | .domain = DOMAIN_KERNEL, |
235 | }, | 235 | }, |
236 | [MT_LOW_VECTORS] = { | 236 | [MT_LOW_VECTORS] = { |
237 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | | 237 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY, |
238 | L_PTE_EXEC, | ||
239 | .prot_l1 = PMD_TYPE_TABLE, | 238 | .prot_l1 = PMD_TYPE_TABLE, |
240 | .domain = DOMAIN_USER, | 239 | .domain = DOMAIN_USER, |
241 | }, | 240 | }, |
242 | [MT_HIGH_VECTORS] = { | 241 | [MT_HIGH_VECTORS] = { |
243 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | | 242 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | |
244 | L_PTE_USER | L_PTE_EXEC, | 243 | L_PTE_USER, |
245 | .prot_l1 = PMD_TYPE_TABLE, | 244 | .prot_l1 = PMD_TYPE_TABLE, |
246 | .domain = DOMAIN_USER, | 245 | .domain = DOMAIN_USER, |
247 | }, | 246 | }, |
248 | [MT_MEMORY] = { | 247 | [MT_MEMORY] = { |
249 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | | 248 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | |
250 | L_PTE_WRITE | L_PTE_EXEC, | 249 | L_PTE_WRITE, |
251 | .prot_l1 = PMD_TYPE_TABLE, | 250 | .prot_l1 = PMD_TYPE_TABLE, |
252 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, | 251 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, |
253 | .domain = DOMAIN_KERNEL, | 252 | .domain = DOMAIN_KERNEL, |
@@ -258,21 +257,21 @@ static struct mem_type mem_types[] = { | |||
258 | }, | 257 | }, |
259 | [MT_MEMORY_NONCACHED] = { | 258 | [MT_MEMORY_NONCACHED] = { |
260 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | | 259 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | |
261 | L_PTE_WRITE | L_PTE_EXEC | L_PTE_MT_BUFFERABLE, | 260 | L_PTE_WRITE| L_PTE_MT_BUFFERABLE, |
262 | .prot_l1 = PMD_TYPE_TABLE, | 261 | .prot_l1 = PMD_TYPE_TABLE, |
263 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, | 262 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, |
264 | .domain = DOMAIN_KERNEL, | 263 | .domain = DOMAIN_KERNEL, |
265 | }, | 264 | }, |
266 | [MT_MEMORY_DTCM] = { | 265 | [MT_MEMORY_DTCM] = { |
267 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | | 266 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | |
268 | L_PTE_WRITE, | 267 | L_PTE_WRITE | L_PTE_XN, |
269 | .prot_l1 = PMD_TYPE_TABLE, | 268 | .prot_l1 = PMD_TYPE_TABLE, |
270 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, | 269 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN, |
271 | .domain = DOMAIN_KERNEL, | 270 | .domain = DOMAIN_KERNEL, |
272 | }, | 271 | }, |
273 | [MT_MEMORY_ITCM] = { | 272 | [MT_MEMORY_ITCM] = { |
274 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | | 273 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | |
275 | L_PTE_WRITE | L_PTE_EXEC, | 274 | L_PTE_WRITE, |
276 | .prot_l1 = PMD_TYPE_TABLE, | 275 | .prot_l1 = PMD_TYPE_TABLE, |
277 | .domain = DOMAIN_KERNEL, | 276 | .domain = DOMAIN_KERNEL, |
278 | }, | 277 | }, |