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

Commit 6d779079 authored by Gerald Schaefer's avatar Gerald Schaefer Committed by Linus Torvalds
Browse files

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: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarGerald 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71fe804b

include/asm-ia64/hugetlb.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
#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 */

include/asm-ia64/page.h

+0 −6
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 
# define HPAGE_MASK		(~(HPAGE_SIZE - 1))



# define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

# define ARCH_HAS_HUGEPAGE_ONLY_RANGE

# define ARCH_HAS_PREPARE_HUGEPAGE_RANGE

# define ARCH_HAS_HUGETLB_FREE_PGD_RANGE

#endif /* CONFIG_HUGETLB_PAGE */



#ifdef __ASSEMBLY__
@@ -153,9 +150,6 @@ typedef union ia64_va { 
# define htlbpage_to_page(x)	(((unsigned long) REGION_NUMBER(x) << 61)			\

				 | (REGION_OFFSET(x) >> (HPAGE_SHIFT-PAGE_SHIFT)))

# define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)

# define is_hugepage_only_range(mm, addr, len)		\

	 (REGION_NUMBER(addr) == RGN_HPAGE ||	\

	  REGION_NUMBER((addr)+(len)-1) == RGN_HPAGE)

extern unsigned int hpage_shift;

#endif

include/asm-powerpc/hugetlb.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
#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 */

include/asm-powerpc/page_64.h

+0 −7
Original line number Diff line number Diff line
@@ -128,11 +128,6 @@ extern void slice_init_context(struct mm_struct *mm, unsigned int psize); 
extern void slice_set_user_psize(struct mm_struct *mm, unsigned int psize);

#define slice_mm_new_context(mm)	((mm)->context.id == 0)



#define ARCH_HAS_HUGEPAGE_ONLY_RANGE

extern int is_hugepage_only_range(struct mm_struct *m,

				  unsigned long addr,

				  unsigned long len);



#endif /* __ASSEMBLY__ */

#else

#define slice_init()
@@ -146,8 +141,6 @@ do { \ 


#ifdef CONFIG_HUGETLB_PAGE



#define ARCH_HAS_HUGETLB_FREE_PGD_RANGE

#define ARCH_HAS_SETCLEAR_HUGE_PTE

#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA



#endif /* !CONFIG_HUGETLB_PAGE */

include/asm-sh/hugetlb.h

0 → 100644
+49 −0
Original line number Diff line number Diff line 
#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 */