diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:43:41 -0400 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/asm-sh/hugetlb.h | |
| parent | a300bec952127d9a15e666b391bb35c9aecb3002 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/asm-sh/hugetlb.h')
| -rw-r--r-- | include/asm-sh/hugetlb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-sh/hugetlb.h b/include/asm-sh/hugetlb.h index 02402303d89b..967068fb79ac 100644 --- a/include/asm-sh/hugetlb.h +++ b/include/asm-sh/hugetlb.h | |||
| @@ -14,7 +14,8 @@ static inline int is_hugepage_only_range(struct mm_struct *mm, | |||
| 14 | * If the arch doesn't supply something else, assume that hugepage | 14 | * If the arch doesn't supply something else, assume that hugepage |
| 15 | * size aligned regions are ok without further preparation. | 15 | * size aligned regions are ok without further preparation. |
| 16 | */ | 16 | */ |
| 17 | static inline int prepare_hugepage_range(unsigned long addr, unsigned long len) | 17 | static inline int prepare_hugepage_range(struct file *file, |
| 18 | unsigned long addr, unsigned long len) | ||
| 18 | { | 19 | { |
| 19 | if (len & ~HPAGE_MASK) | 20 | if (len & ~HPAGE_MASK) |
| 20 | return -EINVAL; | 21 | return -EINVAL; |
| @@ -26,7 +27,7 @@ static inline int prepare_hugepage_range(unsigned long addr, unsigned long len) | |||
| 26 | static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) { | 27 | static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) { |
| 27 | } | 28 | } |
| 28 | 29 | ||
| 29 | static inline void hugetlb_free_pgd_range(struct mmu_gather **tlb, | 30 | static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb, |
| 30 | unsigned long addr, unsigned long end, | 31 | unsigned long addr, unsigned long end, |
| 31 | unsigned long floor, | 32 | unsigned long floor, |
| 32 | unsigned long ceiling) | 33 | unsigned long ceiling) |