Commit 38f0f127 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: page.h: move and unify types for pagetable entry, #5 



based on:

 Subject: x86: page.h: move and unify types for pagetable entry
 From: Jeremy Fitzhardinge <jeremy@goop.org>

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d6e3cf63

include/asm-x86/page.h

+72 −0
Original line number Diff line number Diff line
@@ -181,6 +181,78 @@ static void inline 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_X86_64

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;

}



#if PAGETABLE_LEVELS >= 3

#if PAGETABLE_LEVELS == 4

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	/* PAGETABLE_LEVELS == 3 */

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

#endif	/* PAGETABLE_LEVELS == 4 */



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  /* PAGETABLE_LEVELS == 2 */

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

#endif	/* PAGETABLE_LEVELS >= 3 */



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

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



#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 */



#endif /* CONFIG_X86_64 */

#endif	/* __ASSEMBLY__ */

include/asm-x86/page_64.h

+0 −21
Original line number Diff line number Diff line
@@ -7,30 +7,9 @@ 
extern unsigned long end_pfn;

extern unsigned long end_pfn_map;



/*

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

 */

typedef struct { unsigned long pmd; } pmd_t;

typedef struct { unsigned long pud; } pud_t;

typedef struct { unsigned long pgd; } pgd_t;

#define PTE_MASK	PHYSICAL_PAGE_MASK



typedef struct { unsigned long pgprot; } pgprot_t;



extern unsigned long phys_base;



#define pte_val(x)	((x).pte)

#define pmd_val(x)	((x).pmd)

#define pud_val(x)	((x).pud)

#define pgd_val(x)	((x).pgd)

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



#define __pte(x) ((pte_t) { (x) } )

#define __pmd(x) ((pmd_t) { (x) } )

#define __pud(x) ((pud_t) { (x) } )

#define __pgd(x) ((pgd_t) { (x) } )

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



#endif /* !__ASSEMBLY__ */



#ifndef __ASSEMBLY__