Commit ad4f1f0d authored by Seth Rohit's avatar Seth Rohit Committed by David Mosberger

[PATCH] ia64: small update for hugetlb

Please find attached a small update that syncs up the definition and
usage of check_valid_hugepage_range across different arch dependent and
independent files.
parent 3e69f8b2
...@@ -117,7 +117,7 @@ int is_aligned_hugepage_range(unsigned long addr, unsigned long len) ...@@ -117,7 +117,7 @@ int is_aligned_hugepage_range(unsigned long addr, unsigned long len)
/* This function checks if the address and address+len falls out of HugeTLB region. It /* This function checks if the address and address+len falls out of HugeTLB region. It
* return -EINVAL if any part of address range falls in HugeTLB region. * return -EINVAL if any part of address range falls in HugeTLB region.
*/ */
int is_invalid_hugepage_range(unsigned long addr, unsigned long len) int check_valid_hugepage_range(unsigned long addr, unsigned long len)
{ {
if (REGION_NUMBER(addr) == REGION_HPAGE) if (REGION_NUMBER(addr) == REGION_HPAGE)
return -EINVAL; return -EINVAL;
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
# define HPAGE_SIZE (__IA64_UL_CONST(1) << HPAGE_SHIFT) # define HPAGE_SIZE (__IA64_UL_CONST(1) << HPAGE_SHIFT)
# define HPAGE_MASK (~(HPAGE_SIZE - 1)) # define HPAGE_MASK (~(HPAGE_SIZE - 1))
# define HAVE_ARCH_HUGETLB_UNMAPPED_AREA # define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
# define ARCH_HAS_VALID_HUGEPAGE_RANGE
#endif /* CONFIG_HUGETLB_PAGE */ #endif /* CONFIG_HUGETLB_PAGE */
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
...@@ -131,9 +132,7 @@ typedef union ia64_va { ...@@ -131,9 +132,7 @@ typedef union ia64_va {
# define htlbpage_to_page(x) ((REGION_NUMBER(x) << 61) \ # define htlbpage_to_page(x) ((REGION_NUMBER(x) << 61) \
| (REGION_OFFSET(x) >> (HPAGE_SHIFT-PAGE_SHIFT))) | (REGION_OFFSET(x) >> (HPAGE_SHIFT-PAGE_SHIFT)))
# define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) # define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
extern int is_invalid_hugepage_range(unsigned long addr, unsigned long len); extern int check_valid_hugepage_range(unsigned long addr, unsigned long len);
#else
#define is_invalid_hugepage_range(addr, len) 0
#endif #endif
static __inline__ int static __inline__ int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment