Commit fb355149 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Jeremy Fitzhardinge
Browse files

x86: Split pgtable_64.h into pgtable_64_types.h and pgtable_64.h 



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

arch/x86/include/asm/pgtable_64.h

+2 −46
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#define _ASM_X86_PGTABLE_64_H



#include <linux/const.h>

#include <asm/pgtable_64_types.h>



#ifndef __ASSEMBLY__



/*
@@ -25,32 +27,6 @@ extern void paging_init(void); 


#endif /* !__ASSEMBLY__ */



#define SHARED_KERNEL_PMD	0



/*

 * PGDIR_SHIFT determines what a top-level page table entry can map

 */

#define PGDIR_SHIFT	39

#define PTRS_PER_PGD	512



/*

 * 3rd level page

 */

#define PUD_SHIFT	30

#define PTRS_PER_PUD	512



/*

 * PMD_SHIFT determines the size of the area a middle-level

 * page table can map

 */

#define PMD_SHIFT	21

#define PTRS_PER_PMD	512



/*

 * entries per page directory level

 */

#define PTRS_PER_PTE	512



#ifndef __ASSEMBLY__



#define pte_ERROR(e)					\
@@ -130,26 +106,6 @@ static inline void native_pgd_clear(pgd_t *pgd) 
	native_set_pgd(pgd, native_make_pgd(0));

}



#endif /* !__ASSEMBLY__ */



#define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)

#define PMD_MASK	(~(PMD_SIZE - 1))

#define PUD_SIZE	(_AC(1, UL) << PUD_SHIFT)

#define PUD_MASK	(~(PUD_SIZE - 1))

#define PGDIR_SIZE	(_AC(1, UL) << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE - 1))





#define MAXMEM		 _AC(__AC(1, UL) << MAX_PHYSMEM_BITS, UL)

#define VMALLOC_START    _AC(0xffffc20000000000, UL)

#define VMALLOC_END      _AC(0xffffe1ffffffffff, UL)

#define VMEMMAP_START	 _AC(0xffffe20000000000, UL)

#define MODULES_VADDR    _AC(0xffffffffa0000000, UL)

#define MODULES_END      _AC(0xffffffffff000000, UL)

#define MODULES_LEN   (MODULES_END - MODULES_VADDR)



#ifndef __ASSEMBLY__



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.

arch/x86/include/asm/pgtable_64_types.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PGTABLE_64_DEFS_H

#define _ASM_X86_PGTABLE_64_DEFS_H



#define SHARED_KERNEL_PMD	0



/*

 * PGDIR_SHIFT determines what a top-level page table entry can map

 */

#define PGDIR_SHIFT	39

#define PTRS_PER_PGD	512



/*

 * 3rd level page

 */

#define PUD_SHIFT	30

#define PTRS_PER_PUD	512



/*

 * PMD_SHIFT determines the size of the area a middle-level

 * page table can map

 */

#define PMD_SHIFT	21

#define PTRS_PER_PMD	512



/*

 * entries per page directory level

 */

#define PTRS_PER_PTE	512



#define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)

#define PMD_MASK	(~(PMD_SIZE - 1))

#define PUD_SIZE	(_AC(1, UL) << PUD_SHIFT)

#define PUD_MASK	(~(PUD_SIZE - 1))

#define PGDIR_SIZE	(_AC(1, UL) << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE - 1))





#define MAXMEM		 _AC(__AC(1, UL) << MAX_PHYSMEM_BITS, UL)

#define VMALLOC_START    _AC(0xffffc20000000000, UL)

#define VMALLOC_END      _AC(0xffffe1ffffffffff, UL)

#define VMEMMAP_START	 _AC(0xffffe20000000000, UL)

#define MODULES_VADDR    _AC(0xffffffffa0000000, UL)

#define MODULES_END      _AC(0xffffffffff000000, UL)

#define MODULES_LEN   (MODULES_END - MODULES_VADDR)



#endif /* _ASM_X86_PGTABLE_64_DEFS_H */