diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-07-11 07:57:40 -0400 |
| commit | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch) | |
| tree | 668811bca39ca7c1585da88d52ec2f0a43216c0e /include/asm-powerpc/hugetlb.h | |
| parent | f9f278fefdbbbf198bb4111b3fba47d9043dae59 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/asm-powerpc/hugetlb.h')
| -rw-r--r-- | include/asm-powerpc/hugetlb.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-powerpc/hugetlb.h b/include/asm-powerpc/hugetlb.h index 649c6c3b87b3..be32ff02f4a0 100644 --- a/include/asm-powerpc/hugetlb.h +++ b/include/asm-powerpc/hugetlb.h | |||
| @@ -49,12 +49,6 @@ static inline pte_t huge_pte_wrprotect(pte_t pte) | |||
| 49 | return pte_wrprotect(pte); | 49 | return pte_wrprotect(pte); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, | ||
| 53 | unsigned long addr, pte_t *ptep) | ||
| 54 | { | ||
| 55 | ptep_set_wrprotect(mm, addr, ptep); | ||
| 56 | } | ||
| 57 | |||
| 58 | static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, | 52 | static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, |
| 59 | unsigned long addr, pte_t *ptep, | 53 | unsigned long addr, pte_t *ptep, |
| 60 | pte_t pte, int dirty) | 54 | pte_t pte, int dirty) |