diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hugetlb.h | 4 | ||||
| -rw-r--r-- | include/linux/mempolicy.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 1056717ee501..68d82ad6b17c 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h | |||
| @@ -22,7 +22,7 @@ int hugetlb_report_meminfo(char *); | |||
| 22 | int hugetlb_report_node_meminfo(int, char *); | 22 | int hugetlb_report_node_meminfo(int, char *); |
| 23 | int is_hugepage_mem_enough(size_t); | 23 | int is_hugepage_mem_enough(size_t); |
| 24 | unsigned long hugetlb_total_pages(void); | 24 | unsigned long hugetlb_total_pages(void); |
| 25 | struct page *alloc_huge_page(void); | 25 | struct page *alloc_huge_page(struct vm_area_struct *, unsigned long); |
| 26 | void free_huge_page(struct page *); | 26 | void free_huge_page(struct page *); |
| 27 | int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, | 27 | int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, |
| 28 | unsigned long address, int write_access); | 28 | unsigned long address, int write_access); |
| @@ -97,7 +97,7 @@ static inline unsigned long hugetlb_total_pages(void) | |||
| 97 | #define is_hugepage_only_range(mm, addr, len) 0 | 97 | #define is_hugepage_only_range(mm, addr, len) 0 |
| 98 | #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) \ | 98 | #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) \ |
| 99 | do { } while (0) | 99 | do { } while (0) |
| 100 | #define alloc_huge_page() ({ NULL; }) | 100 | #define alloc_huge_page(vma, addr) ({ NULL; }) |
| 101 | #define free_huge_page(p) ({ (void)(p); BUG(); }) | 101 | #define free_huge_page(p) ({ (void)(p); BUG(); }) |
| 102 | #define hugetlb_fault(mm, vma, addr, write) ({ BUG(); 0; }) | 102 | #define hugetlb_fault(mm, vma, addr, write) ({ BUG(); 0; }) |
| 103 | 103 | ||
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 8b67cf837ca9..817db6427113 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h | |||
| @@ -156,6 +156,8 @@ extern void numa_default_policy(void); | |||
| 156 | extern void numa_policy_init(void); | 156 | extern void numa_policy_init(void); |
| 157 | extern void numa_policy_rebind(const nodemask_t *old, const nodemask_t *new); | 157 | extern void numa_policy_rebind(const nodemask_t *old, const nodemask_t *new); |
| 158 | extern struct mempolicy default_policy; | 158 | extern struct mempolicy default_policy; |
| 159 | extern struct zonelist *huge_zonelist(struct vm_area_struct *vma, | ||
| 160 | unsigned long addr); | ||
| 159 | 161 | ||
| 160 | #else | 162 | #else |
| 161 | 163 | ||
| @@ -232,6 +234,12 @@ static inline void numa_policy_rebind(const nodemask_t *old, | |||
| 232 | { | 234 | { |
| 233 | } | 235 | } |
| 234 | 236 | ||
| 237 | static inline struct zonelist *huge_zonelist(struct vm_area_struct *vma, | ||
| 238 | unsigned long addr) | ||
| 239 | { | ||
| 240 | return NODE_DATA(0)->node_zonelists + gfp_zone(GFP_HIGHUSER); | ||
| 241 | } | ||
| 242 | |||
| 235 | #endif /* CONFIG_NUMA */ | 243 | #endif /* CONFIG_NUMA */ |
| 236 | #endif /* __KERNEL__ */ | 244 | #endif /* __KERNEL__ */ |
| 237 | 245 | ||
