diff options
Diffstat (limited to 'include/asm-ia64')
-rw-r--r-- | include/asm-ia64/hugetlb.h | 5 | ||||
-rw-r--r-- | include/asm-ia64/page.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ia64/hugetlb.h b/include/asm-ia64/hugetlb.h index f28a9701f1cf..da55c63728e0 100644 --- a/include/asm-ia64/hugetlb.h +++ b/include/asm-ia64/hugetlb.h | |||
@@ -4,11 +4,12 @@ | |||
4 | #include <asm/page.h> | 4 | #include <asm/page.h> |
5 | 5 | ||
6 | 6 | ||
7 | void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr, | 7 | void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, |
8 | unsigned long end, unsigned long floor, | 8 | unsigned long end, unsigned long floor, |
9 | unsigned long ceiling); | 9 | unsigned long ceiling); |
10 | 10 | ||
11 | int prepare_hugepage_range(unsigned long addr, unsigned long len); | 11 | int prepare_hugepage_range(struct file *file, |
12 | unsigned long addr, unsigned long len); | ||
12 | 13 | ||
13 | static inline int is_hugepage_only_range(struct mm_struct *mm, | 14 | static inline int is_hugepage_only_range(struct mm_struct *mm, |
14 | unsigned long addr, | 15 | unsigned long addr, |
diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h index 36f39321b768..5f271bc712ee 100644 --- a/include/asm-ia64/page.h +++ b/include/asm-ia64/page.h | |||
@@ -40,7 +40,6 @@ | |||
40 | 40 | ||
41 | #define PAGE_SIZE (__IA64_UL_CONST(1) << PAGE_SHIFT) | 41 | #define PAGE_SIZE (__IA64_UL_CONST(1) << PAGE_SHIFT) |
42 | #define PAGE_MASK (~(PAGE_SIZE - 1)) | 42 | #define PAGE_MASK (~(PAGE_SIZE - 1)) |
43 | #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) | ||
44 | 43 | ||
45 | #define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */ | 44 | #define PERCPU_PAGE_SHIFT 16 /* log2() of max. size of per-CPU area */ |
46 | #define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT) | 45 | #define PERCPU_PAGE_SIZE (__IA64_UL_CONST(1) << PERCPU_PAGE_SHIFT) |