1 files changed, 187 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 6f7c102018bf..8fef0f6bfbb6 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_X86_PGTABLE_H
 #define _ASM_X86_PGTABLE_H
+#include <asm/page.h>
 #define FIRST_USER_ADDRESS      0
 #define _PAGE_BIT_PRESENT       0       /* is present */
@@ -236,7 +238,7 @@ static inline unsigned long pte_pfn(pte_t pte)
 static inline int pmd_large(pmd_t pte)
 {
-        return (pmd_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==
+        return (pmd_flags(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==
                (_PAGE_PSE | _PAGE_PRESENT);
 }
@@ -465,6 +467,190 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base)
 # include "pgtable_64.h"
 #endif
+#ifndef __ASSEMBLY__
+#include <linux/mm_types.h>
+static inline int pte_none(pte_t pte)
+{
+        return !pte.pte;
+}
+#define __HAVE_ARCH_PTE_SAME
+static inline int pte_same(pte_t a, pte_t b)
+{
+        return a.pte == b.pte;
+}
+static inline int pte_present(pte_t a)
+{
+        return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);
+}
+static inline int pmd_present(pmd_t pmd)
+{
+        return pmd_flags(pmd) & _PAGE_PRESENT;
+}
+static inline int pmd_none(pmd_t pmd)
+{
+        /* Only check low word on 32-bit platforms, since it might be
+           out of sync with upper half. */
+        return (unsigned long)native_pmd_val(pmd) == 0;
+}
+static inline unsigned long pmd_page_vaddr(pmd_t pmd)
+{
+        return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK);
+}
+/*
+ * Currently stuck as a macro due to indirect forward reference to
+ * linux/mmzone.h's __section_mem_map_addr() definition:
+ */
+#define pmd_page(pmd)   pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
+/*
+ * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
+ *
+ * this macro returns the index of the entry in the pmd page which would
+ * control the given virtual address
+ */
+static inline unsigned pmd_index(unsigned long address)
+{
+        return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
+}
+/*
+ * Conversion functions: convert a page and protection to a page entry,
+ * and a page entry and page directory to the page they refer to.
+ *
+ * (Currently stuck as a macro because of indirect forward reference
+ * to linux/mm.h:page_to_nid())
+ */
+#define mk_pte(page, pgprot)   pfn_pte(page_to_pfn(page), (pgprot))
+/*
+ * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
+ *
+ * this function returns the index of the entry in the pte page which would
+ * control the given virtual address
+ */
+static inline unsigned pte_index(unsigned long address)
+{
+        return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);
+}
+static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
+{
+        return (pte_t *)pmd_page_vaddr(*pmd) + pte_index(address);
+}
+static inline int pmd_bad(pmd_t pmd)
+{
+        return (pmd_flags(pmd) & ~_PAGE_USER) != _KERNPG_TABLE;
+}
+static inline unsigned long pages_to_mb(unsigned long npg)
+{
+        return npg >> (20 - PAGE_SHIFT);
+}
+#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
+        remap_pfn_range(vma, vaddr, pfn, size, prot)
+#if PAGETABLE_LEVELS == 2
+static inline int pud_large(pud_t pud)
+{
+        return 0;
+}
+#endif
+#if PAGETABLE_LEVELS > 2
+static inline int pud_none(pud_t pud)
+{
+        return native_pud_val(pud) == 0;
+}
+static inline int pud_present(pud_t pud)
+{
+        return pud_flags(pud) & _PAGE_PRESENT;
+}
+static inline unsigned long pud_page_vaddr(pud_t pud)
+{
+        return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);
+}
+/*
+ * Currently stuck as a macro due to indirect forward reference to
+ * linux/mmzone.h's __section_mem_map_addr() definition:
+ */
+#define pud_page(pud)           pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
+/* Find an entry in the second-level page table.. */
+static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
+{
+        return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);
+}
+static inline unsigned long pmd_pfn(pmd_t pmd)
+{
+        return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;
+}
+static inline int pud_large(pud_t pud)
+{
+        return (pud_flags(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==
+                (_PAGE_PSE | _PAGE_PRESENT);
+}
+static inline int pud_bad(pud_t pud)
+{
+        return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0;
+}
+#endif  /* PAGETABLE_LEVELS > 2 */
+#if PAGETABLE_LEVELS > 3
+static inline int pgd_present(pgd_t pgd)
+{
+        return pgd_flags(pgd) & _PAGE_PRESENT;
+}
+static inline unsigned long pgd_page_vaddr(pgd_t pgd)
+{
+        return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);
+}
+/*
+ * Currently stuck as a macro due to indirect forward reference to
+ * linux/mmzone.h's __section_mem_map_addr() definition:
+ */
+#define pgd_page(pgd)           pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
+/* to find an entry in a page-table-directory. */
+static inline unsigned pud_index(unsigned long address)
+{
+        return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
+}
+static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
+{
+        return (pud_t *)pgd_page_vaddr(*pgd) + pud_index(address);
+}
+static inline int pgd_bad(pgd_t pgd)
+{
+        return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
+}
+static inline int pgd_none(pgd_t pgd)
+{
+        return !native_pgd_val(pgd);
+}
+#endif  /* PAGETABLE_LEVELS > 3 */
+#endif  /* __ASSEMBLY__ */
 /*
 * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
 *

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 6f7c102018bf..8fef0f6bfbb6 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h
@@ -1,6 +1,8 @@
1	#ifndef _ASM_X86_PGTABLE_H	1	#ifndef _ASM_X86_PGTABLE_H
2	#define _ASM_X86_PGTABLE_H	2	#define _ASM_X86_PGTABLE_H
3		3
		4	#include <asm/page.h>
		5
4	#define FIRST_USER_ADDRESS 0	6	#define FIRST_USER_ADDRESS 0
5		7
6	#define _PAGE_BIT_PRESENT 0 /* is present */	8	#define _PAGE_BIT_PRESENT 0 /* is present */
@@ -236,7 +238,7 @@ static inline unsigned long pte_pfn(pte_t pte)
236		238
237	static inline int pmd_large(pmd_t pte)	239	static inline int pmd_large(pmd_t pte)
238	{	240	{
239	return (pmd_val(pte) & (_PAGE_PSE \| _PAGE_PRESENT)) ==	241	return (pmd_flags(pte) & (_PAGE_PSE \| _PAGE_PRESENT)) ==
240	(_PAGE_PSE \| _PAGE_PRESENT);	242	(_PAGE_PSE \| _PAGE_PRESENT);
241	}	243	}
242		244
@@ -465,6 +467,190 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base)
465	# include "pgtable_64.h"	467	# include "pgtable_64.h"
466	#endif	468	#endif
467		469
		470	#ifndef __ASSEMBLY__
		471	#include <linux/mm_types.h>
		472
		473	static inline int pte_none(pte_t pte)
		474	{
		475	return !pte.pte;
		476	}
		477
		478	#define __HAVE_ARCH_PTE_SAME
		479	static inline int pte_same(pte_t a, pte_t b)
		480	{
		481	return a.pte == b.pte;
		482	}
		483
		484	static inline int pte_present(pte_t a)
		485	{
		486	return pte_flags(a) & (_PAGE_PRESENT \| _PAGE_PROTNONE);
		487	}
		488
		489	static inline int pmd_present(pmd_t pmd)
		490	{
		491	return pmd_flags(pmd) & _PAGE_PRESENT;
		492	}
		493
		494	static inline int pmd_none(pmd_t pmd)
		495	{
		496	/* Only check low word on 32-bit platforms, since it might be
		497	out of sync with upper half. */
		498	return (unsigned long)native_pmd_val(pmd) == 0;
		499	}
		500
		501	static inline unsigned long pmd_page_vaddr(pmd_t pmd)
		502	{
		503	return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK);
		504	}
		505
		506	/*
		507	* Currently stuck as a macro due to indirect forward reference to
		508	* linux/mmzone.h's __section_mem_map_addr() definition:
		509	*/
		510	#define pmd_page(pmd) pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
		511
		512	/*
		513	* the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
		514	*
		515	* this macro returns the index of the entry in the pmd page which would
		516	* control the given virtual address
		517	*/
		518	static inline unsigned pmd_index(unsigned long address)
		519	{
		520	return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
		521	}
		522
		523	/*
		524	* Conversion functions: convert a page and protection to a page entry,
		525	* and a page entry and page directory to the page they refer to.
		526	*
		527	* (Currently stuck as a macro because of indirect forward reference
		528	* to linux/mm.h:page_to_nid())
		529	*/
		530	#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
		531
		532	/*
		533	* the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
		534	*
		535	* this function returns the index of the entry in the pte page which would
		536	* control the given virtual address
		537	*/
		538	static inline unsigned pte_index(unsigned long address)
		539	{
		540	return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);
		541	}
		542
		543	static inline pte_t pte_offset_kernel(pmd_t pmd, unsigned long address)
		544	{
		545	return (pte_t )pmd_page_vaddr(pmd) + pte_index(address);
		546	}
		547
		548	static inline int pmd_bad(pmd_t pmd)
		549	{
		550	return (pmd_flags(pmd) & ~_PAGE_USER) != _KERNPG_TABLE;
		551	}
		552
		553	static inline unsigned long pages_to_mb(unsigned long npg)
		554	{
		555	return npg >> (20 - PAGE_SHIFT);
		556	}
		557
		558	#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
		559	remap_pfn_range(vma, vaddr, pfn, size, prot)
		560
		561	#if PAGETABLE_LEVELS == 2
		562	static inline int pud_large(pud_t pud)
		563	{
		564	return 0;
		565	}
		566	#endif
		567
		568	#if PAGETABLE_LEVELS > 2
		569	static inline int pud_none(pud_t pud)
		570	{
		571	return native_pud_val(pud) == 0;
		572	}
		573
		574	static inline int pud_present(pud_t pud)
		575	{
		576	return pud_flags(pud) & _PAGE_PRESENT;
		577	}
		578
		579	static inline unsigned long pud_page_vaddr(pud_t pud)
		580	{
		581	return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);
		582	}
		583
		584	/*
		585	* Currently stuck as a macro due to indirect forward reference to
		586	* linux/mmzone.h's __section_mem_map_addr() definition:
		587	*/
		588	#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
		589
		590	/* Find an entry in the second-level page table.. */
		591	static inline pmd_t pmd_offset(pud_t pud, unsigned long address)
		592	{
		593	return (pmd_t )pud_page_vaddr(pud) + pmd_index(address);
		594	}
		595
		596	static inline unsigned long pmd_pfn(pmd_t pmd)
		597	{
		598	return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;
		599	}
		600
		601	static inline int pud_large(pud_t pud)
		602	{
		603	return (pud_flags(pud) & (_PAGE_PSE \| _PAGE_PRESENT)) ==
		604	(_PAGE_PSE \| _PAGE_PRESENT);
		605	}
		606
		607	static inline int pud_bad(pud_t pud)
		608	{
		609	return (pud_flags(pud) & ~(_KERNPG_TABLE \| _PAGE_USER)) != 0;
		610	}
		611	#endif /* PAGETABLE_LEVELS > 2 */
		612
		613	#if PAGETABLE_LEVELS > 3
		614	static inline int pgd_present(pgd_t pgd)
		615	{
		616	return pgd_flags(pgd) & _PAGE_PRESENT;
		617	}
		618
		619	static inline unsigned long pgd_page_vaddr(pgd_t pgd)
		620	{
		621	return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);
		622	}
		623
		624	/*
		625	* Currently stuck as a macro due to indirect forward reference to
		626	* linux/mmzone.h's __section_mem_map_addr() definition:
		627	*/
		628	#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
		629
		630	/* to find an entry in a page-table-directory. */
		631	static inline unsigned pud_index(unsigned long address)
		632	{
		633	return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
		634	}
		635
		636	static inline pud_t pud_offset(pgd_t pgd, unsigned long address)
		637	{
		638	return (pud_t )pgd_page_vaddr(pgd) + pud_index(address);
		639	}
		640
		641	static inline int pgd_bad(pgd_t pgd)
		642	{
		643	return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
		644	}
		645
		646	static inline int pgd_none(pgd_t pgd)
		647	{
		648	return !native_pgd_val(pgd);
		649	}
		650	#endif /* PAGETABLE_LEVELS > 3 */
		651
		652	#endif /* __ASSEMBLY__ */
		653
468	/*	654	/*
469	* the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]	655	* the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
470	*	656	*