Commit 1dfc07aa authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Jeremy Fitzhardinge
Browse files

x86: move 2 and 3 level asm-generic defs into page-defs 



Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@goop.org>
parent 51c78eb3

arch/x86/include/asm/page.h

+0 −4
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ static inline pudval_t native_pud_val(pud_t pud) 
	return pud.pud;

}

#else	/* PAGETABLE_LEVELS == 3 */

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



static inline pudval_t native_pud_val(pud_t pud)

{

	return native_pgd_val(pud.pgd);
@@ -82,8 +80,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) 
}



#else  /* PAGETABLE_LEVELS == 2 */

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



static inline pmdval_t native_pmd_val(pmd_t pmd)

{

	return native_pgd_val(pmd.pud.pgd);

arch/x86/include/asm/page_types.h

+4 −0
Original line number Diff line number Diff line
@@ -53,10 +53,14 @@ typedef struct { pgprotval_t pgprot; } pgprot_t; 


#if PAGETABLE_LEVELS > 3

typedef struct { pudval_t pud; } pud_t;

#else

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

#endif



#if PAGETABLE_LEVELS > 2

typedef struct { pmdval_t pmd; } pmd_t;

#else

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

#endif



typedef struct page *pgtable_t;