Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 360618
b: refs/heads/master
c: 69dde4c
h: refs/heads/master
v: v3
  • Loading branch information
Catalin Marinas authored and Russell King committed Feb 21, 2013
1 parent 4bce75f commit 5d6c838
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70264367a243a68b1d5636ffb570183449803cbe
refs/heads/master: 69dde4c52dbac2891b49ff9723d9c84efc5baf6f
3 changes: 2 additions & 1 deletion trunk/arch/arm/include/asm/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }

static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER | L_PTE_NONE;
const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
L_PTE_NONE | L_PTE_VALID;
pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
return pte;
}
Expand Down

0 comments on commit 5d6c838

Please sign in to comment.