Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8edf344c authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Andi Kleen
Browse files

hugetlb: move definition of is_vm_hugetlb_page() to hugepage_inline.h 



is_vm_hugetlb_page() is a widely used inline function to insert hooks
into hugetlb code.
But we can't use it in pagemap.h because of circular dependency of
the header files. This patch removes this limitation.

Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Acked-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent 9fe6206f

include/linux/hugetlb.h

+1 −10
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _LINUX_HUGETLB_H



#include <linux/fs.h>

#include <linux/hugetlb_inline.h>



struct ctl_table;

struct user_struct;
@@ -14,11 +15,6 @@ struct user_struct; 


int PageHuge(struct page *page);



static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)

{

	return vma->vm_flags & VM_HUGETLB;

}



void reset_vma_resv_huge_pages(struct vm_area_struct *vma);

int hugetlb_sysctl_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);

int hugetlb_overcommit_handler(struct ctl_table *, int, void __user *, size_t *, loff_t *);
@@ -77,11 +73,6 @@ static inline int PageHuge(struct page *page) 
	return 0;

}



static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)

{

	return 0;

}



static inline void reset_vma_resv_huge_pages(struct vm_area_struct *vma)

{

}

include/linux/hugetlb_inline.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_HUGETLB_INLINE_H

#define _LINUX_HUGETLB_INLINE_H 1



#ifdef CONFIG_HUGETLBFS



#include <linux/mm.h>



static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)

{

	return vma->vm_flags & VM_HUGETLB;

}



#else



static inline int is_vm_hugetlb_page(struct vm_area_struct *vma)

{

	return 0;

}



#endif



#endif

include/linux/pagemap.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/gfp.h>

#include <linux/bitops.h>

#include <linux/hardirq.h> /* for in_interrupt() */

#include <linux/hugetlb_inline.h>



/*

 * Bits in mapping->flags.  The lower __GFP_BITS_SHIFT bits are the page