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

Commit 54321d94 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

x86: move pte types into pgtable*.h 



pgtable*.h is intended for definitions relating to actual pagetables
and their entries, so move all the definitions for
(pte|pmd|pud|pgd)(val)?_t to the appropriate pgtable*.h headers.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
parent e2f5bda9

arch/x86/include/asm/page.h

+0 −22
Original line number Diff line number Diff line
@@ -31,28 +31,6 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, 
	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

#else  /* !CONFIG_PARAVIRT */



#define pgd_val(x)	native_pgd_val(x)

#define __pgd(x)	native_make_pgd(x)



#ifndef __PAGETABLE_PUD_FOLDED

#define pud_val(x)	native_pud_val(x)

#define __pud(x)	native_make_pud(x)

#endif



#ifndef __PAGETABLE_PMD_FOLDED

#define pmd_val(x)	native_pmd_val(x)

#define __pmd(x)	native_make_pmd(x)

#endif



#define pte_val(x)	native_pte_val(x)

#define __pte(x)	native_make_pte(x)



#endif	/* CONFIG_PARAVIRT */



#define __pa(x)		__phys_addr((unsigned long)(x))

#define __pa_nodebug(x)	__phys_addr_nodebug((unsigned long)(x))

/* __pa_symbol should be used for C visible symbols.

arch/x86/include/asm/page_32_types.h

+0 −30
Original line number Diff line number Diff line
@@ -43,36 +43,6 @@ 


#ifndef __ASSEMBLY__



#include <linux/types.h>



#ifdef CONFIG_X86_PAE

typedef u64	pteval_t;

typedef u64	pmdval_t;

typedef u64	pudval_t;

typedef u64	pgdval_t;

typedef u64	pgprotval_t;



typedef union {

	struct {

		unsigned long pte_low, pte_high;

	};

	pteval_t pte;

} pte_t;

#else  /* !CONFIG_X86_PAE */

typedef unsigned long	pteval_t;

typedef unsigned long	pmdval_t;

typedef unsigned long	pudval_t;

typedef unsigned long	pgdval_t;

typedef unsigned long	pgprotval_t;



typedef union {

	pteval_t pte;

	pteval_t pte_low;

} pte_t;

#endif	/* CONFIG_X86_PAE */



extern int nx_enabled;



/*

 * This much address space is reserved for vmalloc() and iomap()

 * as well as fixmap mappings.

arch/x86/include/asm/page_64_types.h

+0 −11
Original line number Diff line number Diff line
@@ -71,17 +71,6 @@ extern unsigned long phys_base; 
extern unsigned long __phys_addr(unsigned long);

#define __phys_reloc_hide(x)	(x)



/*

 * These are used to make use of C type-checking..

 */

typedef unsigned long	pteval_t;

typedef unsigned long	pmdval_t;

typedef unsigned long	pudval_t;

typedef unsigned long	pgdval_t;

typedef unsigned long	pgprotval_t;



typedef struct { pteval_t pte; } pte_t;



#define vmemmap ((struct page *)VMEMMAP_START)



extern unsigned long init_memory_mapping(unsigned long start,

arch/x86/include/asm/page_types.h

+3 −94
Original line number Diff line number Diff line
@@ -46,106 +46,15 @@ 


#ifndef __ASSEMBLY__



#include <linux/types.h>



typedef struct { pgdval_t pgd; } pgd_t;

typedef struct { pgprotval_t pgprot; } pgprot_t;



static inline pgd_t native_make_pgd(pgdval_t val)

{

	return (pgd_t) { val };

}



static inline pgdval_t native_pgd_val(pgd_t pgd)

{

	return pgd.pgd;

}



static inline pgdval_t pgd_flags(pgd_t pgd)

{

	return native_pgd_val(pgd) & PTE_FLAGS_MASK;

}



#if PAGETABLE_LEVELS > 3

typedef struct { pudval_t pud; } pud_t;



static inline pud_t native_make_pud(pmdval_t val)

{

	return (pud_t) { val };

}



static inline pudval_t native_pud_val(pud_t pud)

{

	return pud.pud;

}

#else

#include <asm-generic/pgtable-nopud.h>



static inline pudval_t native_pud_val(pud_t pud)

{

	return native_pgd_val(pud.pgd);

}

#endif



#if PAGETABLE_LEVELS > 2

typedef struct { pmdval_t pmd; } pmd_t;



static inline pmd_t native_make_pmd(pmdval_t val)

{

	return (pmd_t) { val };

}



static inline pmdval_t native_pmd_val(pmd_t pmd)

{

	return pmd.pmd;

}

#else

#include <asm-generic/pgtable-nopmd.h>



static inline pmdval_t native_pmd_val(pmd_t pmd)

{

	return native_pgd_val(pmd.pud.pgd);

}

#endif



static inline pudval_t pud_flags(pud_t pud)

{

	return native_pud_val(pud) & PTE_FLAGS_MASK;

}



static inline pmdval_t pmd_flags(pmd_t pmd)

{

	return native_pmd_val(pmd) & PTE_FLAGS_MASK;

}



static inline pte_t native_make_pte(pteval_t val)

{

	return (pte_t) { .pte = val };

}



static inline pteval_t native_pte_val(pte_t pte)

{

	return pte.pte;

}



static inline pteval_t pte_flags(pte_t pte)

{

	return native_pte_val(pte) & PTE_FLAGS_MASK;

}



#define pgprot_val(x)	((x).pgprot)

#define __pgprot(x)	((pgprot_t) { (x) } )





typedef struct page *pgtable_t;

struct pgprot;



extern int page_is_ram(unsigned long pagenr);

extern int pagerange_is_ram(unsigned long start, unsigned long end);

extern int devmem_is_allowed(unsigned long pagenr);

extern void map_devmem(unsigned long pfn, unsigned long size,

		       pgprot_t vma_prot);

		       struct pgprot vma_prot);

extern void unmap_devmem(unsigned long pfn, unsigned long size,

			 pgprot_t vma_prot);

			 struct pgprot vma_prot);



extern unsigned long max_low_pfn_mapped;

extern unsigned long max_pfn_mapped;

arch/x86/include/asm/paravirt.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * para-virtualization: those hooks are defined here. */



#ifdef CONFIG_PARAVIRT

#include <asm/page_types.h>

#include <asm/pgtable_types.h>

#include <asm/asm.h>



/* Bitmask of what can be clobbered: usually at least eax. */