diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-14 00:29:49 -0400 |
| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 (patch) | |
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 /include/asm-powerpc | |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/pgtable-ppc64.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-powerpc/pgtable-ppc64.h b/include/asm-powerpc/pgtable-ppc64.h index d09599cccb35..ab98a9c80b28 100644 --- a/include/asm-powerpc/pgtable-ppc64.h +++ b/include/asm-powerpc/pgtable-ppc64.h | |||
| @@ -315,13 +315,14 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, | |||
| 315 | return; | 315 | return; |
| 316 | old = pte_update(mm, addr, ptep, _PAGE_RW, 0); | 316 | old = pte_update(mm, addr, ptep, _PAGE_RW, 0); |
| 317 | } | 317 | } |
| 318 | |||
| 318 | static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, | 319 | static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, |
| 319 | unsigned long addr, pte_t *ptep) | 320 | unsigned long addr, pte_t *ptep) |
| 320 | { | 321 | { |
| 321 | unsigned long old; | 322 | unsigned long old; |
| 322 | 323 | ||
| 323 | if ((pte_val(*ptep) & _PAGE_RW) == 0) | 324 | if ((pte_val(*ptep) & _PAGE_RW) == 0) |
| 324 | return; | 325 | return; |
| 325 | old = pte_update(mm, addr, ptep, _PAGE_RW, 1); | 326 | old = pte_update(mm, addr, ptep, _PAGE_RW, 1); |
| 326 | } | 327 | } |
| 327 | 328 | ||