diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-28 22:11:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-04 01:32:51 -0400 |
| commit | eaf85da82669b057f20c4e438dc2566b51a83af6 (patch) | |
| tree | d9a6121d113e5c12e170416ad88a51b1e35556e6 | |
| parent | c2e4e676adb40ea764af79d3e08be954e14a0f4c (diff) | |
sparc64: Don't use _PAGE_PRESENT in pte_modify() mask.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/include/asm/pgtable_64.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 50b2d78225ac..ac5f7087a50d 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h | |||
| @@ -258,8 +258,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t prot) | |||
| 258 | { | 258 | { |
| 259 | unsigned long mask, tmp; | 259 | unsigned long mask, tmp; |
| 260 | 260 | ||
| 261 | /* SUN4U: 0x630107ffffffecb8 (negated == 0x9cfef80000001347) | 261 | /* SUN4U: 0x630107ffffffec38 (negated == 0x9cfef800000013c7) |
| 262 | * SUN4V: 0x33ffffffffffee17 (negated == 0xcc000000000011e8) | 262 | * SUN4V: 0x33ffffffffffee07 (negated == 0xcc000000000011f8) |
| 263 | * | 263 | * |
| 264 | * Even if we use negation tricks the result is still a 6 | 264 | * Even if we use negation tricks the result is still a 6 |
| 265 | * instruction sequence, so don't try to play fancy and just | 265 | * instruction sequence, so don't try to play fancy and just |
| @@ -289,10 +289,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t prot) | |||
| 289 | " .previous\n" | 289 | " .previous\n" |
| 290 | : "=r" (mask), "=r" (tmp) | 290 | : "=r" (mask), "=r" (tmp) |
| 291 | : "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U | | 291 | : "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U | |
| 292 | _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U | _PAGE_PRESENT_4U | | 292 | _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U | |
| 293 | _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4U), | 293 | _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4U), |
| 294 | "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V | | 294 | "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V | |
| 295 | _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V | _PAGE_PRESENT_4V | | 295 | _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V | |
| 296 | _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V)); | 296 | _PAGE_SPECIAL | _PAGE_PMD_HUGE | _PAGE_SZALL_4V)); |
| 297 | 297 | ||
| 298 | return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask)); | 298 | return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask)); |
