-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
hugetlbfs: architecture header cleanup
This patch moves all architecture functions for hugetlb to architecture header files (include/asm-foo/hugetlb.h) and converts all macros to inline functions. It also removes (!) ARCH_HAS_HUGEPAGE_ONLY_RANGE, ARCH_HAS_HUGETLB_FREE_PGD_RANGE, ARCH_HAS_PREPARE_HUGEPAGE_RANGE, ARCH_HAS_SETCLEAR_HUGE_PTE and ARCH_HAS_HUGETLB_PREFAULT_HOOK. Getting rid of the ARCH_HAS_xxx #ifdef and macro fugliness should increase readability and maintainability, at the price of some code duplication. An asm-generic common part would have reduced the loc, but we would end up with new ARCH_HAS_xxx defines eventually. Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
- Loading branch information
Gerald Schaefer
authored and
Linus Torvalds
committed
Apr 28, 2008
1 parent
71fe804
commit 6d77907
Showing
9 changed files
with
215 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
#ifndef _ASM_IA64_HUGETLB_H | ||
#define _ASM_IA64_HUGETLB_H | ||
|
||
#include <asm/page.h> | ||
|
||
|
||
void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr, | ||
unsigned long end, unsigned long floor, | ||
unsigned long ceiling); | ||
|
||
int prepare_hugepage_range(unsigned long addr, unsigned long len); | ||
|
||
static inline int is_hugepage_only_range(struct mm_struct *mm, | ||
unsigned long addr, | ||
unsigned long len) | ||
{ | ||
return (REGION_NUMBER(addr) == RGN_HPAGE || | ||
REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE); | ||
} | ||
|
||
static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) | ||
{ | ||
} | ||
|
||
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, | ||
pte_t *ptep, pte_t pte) | ||
{ | ||
set_pte_at(mm, addr, ptep, pte); | ||
} | ||
|
||
static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm, | ||
unsigned long addr, pte_t *ptep) | ||
{ | ||
return ptep_get_and_clear(mm, addr, ptep); | ||
} | ||
|
||
#endif /* _ASM_IA64_HUGETLB_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
#ifndef _ASM_POWERPC_HUGETLB_H | ||
#define _ASM_POWERPC_HUGETLB_H | ||
|
||
#include <asm/page.h> | ||
|
||
|
||
int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, | ||
unsigned long len); | ||
|
||
void hugetlb_free_pgd_range(struct mmu_gather **tlb, unsigned long addr, | ||
unsigned long end, unsigned long floor, | ||
unsigned long ceiling); | ||
|
||
void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, | ||
pte_t *ptep, pte_t pte); | ||
|
||
pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, | ||
pte_t *ptep); | ||
|
||
/* | ||
* If the arch doesn't supply something else, assume that hugepage | ||
* size aligned regions are ok without further preparation. | ||
*/ | ||
static inline int prepare_hugepage_range(unsigned long addr, unsigned long len) | ||
{ | ||
if (len & ~HPAGE_MASK) | ||
return -EINVAL; | ||
if (addr & ~HPAGE_MASK) | ||
return -EINVAL; | ||
return 0; | ||
} | ||
|
||
static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) | ||
{ | ||
} | ||
|
||
#endif /* _ASM_POWERPC_HUGETLB_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
#ifndef _ASM_SH_HUGETLB_H | ||
#define _ASM_SH_HUGETLB_H | ||
|
||
#include <asm/page.h> | ||
|
||
|
||
static inline int is_hugepage_only_range(struct mm_struct *mm, | ||
unsigned long addr, | ||
unsigned long len) { | ||
return 0; | ||
} | ||
|
||
/* | ||
* If the arch doesn't supply something else, assume that hugepage | ||
* size aligned regions are ok without further preparation. | ||
*/ | ||
static inline int prepare_hugepage_range(unsigned long addr, unsigned long len) | ||
{ | ||
if (len & ~HPAGE_MASK) | ||
return -EINVAL; | ||
if (addr & ~HPAGE_MASK) | ||
return -EINVAL; | ||
return 0; | ||
} | ||
|
||
static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) { | ||
} | ||
|
||
static inline void hugetlb_free_pgd_range(struct mmu_gather **tlb, | ||
unsigned long addr, unsigned long end, | ||
unsigned long floor, | ||
unsigned long ceiling) | ||
{ | ||
free_pgd_range(tlb, addr, end, floor, ceiling); | ||
} | ||
|
||
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, | ||
pte_t *ptep, pte_t pte) | ||
{ | ||
set_pte_at(mm, addr, ptep, pte); | ||
} | ||
|
||
static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm, | ||
unsigned long addr, pte_t *ptep) | ||
{ | ||
return ptep_get_and_clear(mm, addr, ptep); | ||
} | ||
|
||
#endif /* _ASM_SH_HUGETLB_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
#ifndef _ASM_SPARC64_HUGETLB_H | ||
#define _ASM_SPARC64_HUGETLB_H | ||
|
||
#include <asm/page.h> | ||
|
||
|
||
void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, | ||
pte_t *ptep, pte_t pte); | ||
|
||
pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, | ||
pte_t *ptep); | ||
|
||
void hugetlb_prefault_arch_hook(struct mm_struct *mm); | ||
|
||
static inline int is_hugepage_only_range(struct mm_struct *mm, | ||
unsigned long addr, | ||
unsigned long len) { | ||
return 0; | ||
} | ||
|
||
/* | ||
* If the arch doesn't supply something else, assume that hugepage | ||
* size aligned regions are ok without further preparation. | ||
*/ | ||
static inline int prepare_hugepage_range(unsigned long addr, unsigned long len) | ||
{ | ||
if (len & ~HPAGE_MASK) | ||
return -EINVAL; | ||
if (addr & ~HPAGE_MASK) | ||
return -EINVAL; | ||
return 0; | ||
} | ||
|
||
static inline void hugetlb_free_pgd_range(struct mmu_gather **tlb, | ||
unsigned long addr, unsigned long end, | ||
unsigned long floor, | ||
unsigned long ceiling) | ||
{ | ||
free_pgd_range(tlb, addr, end, floor, ceiling); | ||
} | ||
|
||
#endif /* _ASM_SPARC64_HUGETLB_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
#ifndef _ASM_X86_HUGETLB_H | ||
#define _ASM_X86_HUGETLB_H | ||
|
||
#include <asm/page.h> | ||
|
||
|
||
static inline int is_hugepage_only_range(struct mm_struct *mm, | ||
unsigned long addr, | ||
unsigned long len) { | ||
return 0; | ||
} | ||
|
||
/* | ||
* If the arch doesn't supply something else, assume that hugepage | ||
* size aligned regions are ok without further preparation. | ||
*/ | ||
static inline int prepare_hugepage_range(unsigned long addr, unsigned long len) | ||
{ | ||
if (len & ~HPAGE_MASK) | ||
return -EINVAL; | ||
if (addr & ~HPAGE_MASK) | ||
return -EINVAL; | ||
return 0; | ||
} | ||
|
||
static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm) { | ||
} | ||
|
||
static inline void hugetlb_free_pgd_range(struct mmu_gather **tlb, | ||
unsigned long addr, unsigned long end, | ||
unsigned long floor, | ||
unsigned long ceiling) | ||
{ | ||
free_pgd_range(tlb, addr, end, floor, ceiling); | ||
} | ||
|
||
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, | ||
pte_t *ptep, pte_t pte) | ||
{ | ||
set_pte_at(mm, addr, ptep, pte); | ||
} | ||
|
||
static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm, | ||
unsigned long addr, pte_t *ptep) | ||
{ | ||
return ptep_get_and_clear(mm, addr, ptep); | ||
} | ||
|
||
#endif /* _ASM_X86_HUGETLB_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters