From deae5b3178249b0c37d84d27da25939cdb55b4e5 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Thu, 3 May 2012 15:43:35 +1000 Subject: [PATCH] hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2 Further cleanup of the above patch Signed-off-by: Aneesh Kumar K.V Signed-off-by: Andrew Morton --- include/linux/hugetlb.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 4b3f38542a3c..c21e136e8623 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -100,7 +100,6 @@ static inline unsigned long hugetlb_total_pages(void) #define follow_huge_addr(mm, addr, write) ERR_PTR(-EINVAL) #define copy_hugetlb_page_range(src, dst, vma) ({ BUG(); 0; }) #define hugetlb_prefault(mapping, vma) ({ BUG(); 0; }) -#define unmap_hugepage_range(vma, start, end, page) BUG() static inline void hugetlb_report_meminfo(struct seq_file *m) { } @@ -114,7 +113,11 @@ static inline void hugetlb_report_meminfo(struct seq_file *m) #define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; }) #define hugetlb_fault(mm, vma, addr, flags) ({ BUG(); 0; }) #define huge_pte_offset(mm, address) 0 -#define dequeue_hwpoisoned_huge_page(page) 0 +static inline int dequeue_hwpoisoned_huge_page(struct page *page) +{ + return 0; +} + static inline void copy_huge_page(struct page *dst, struct page *src) { } @@ -125,6 +128,7 @@ static inline void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page) { + BUG(); } #endif /* !CONFIG_HUGETLB_PAGE */ -- 2.39.5