projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...
[cascardo/linux.git]
/
include
/
asm-x86
/
pgtable.h
diff --git
a/include/asm-x86/pgtable.h
b/include/asm-x86/pgtable.h
index
04caa2f
..
888add7
100644
(file)
--- a/
include/asm-x86/pgtable.h
+++ b/
include/asm-x86/pgtable.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM_X86
_PGTABLE_H
-#define
_ASM_X86
_PGTABLE_H
+#ifndef
ASM_X86_
_PGTABLE_H
+#define
ASM_X86_
_PGTABLE_H
#define FIRST_USER_ADDRESS 0
#define FIRST_USER_ADDRESS 0
@@
-186,6
+186,13
@@
static inline int pte_special(pte_t pte)
return pte_val(pte) & _PAGE_SPECIAL;
}
return pte_val(pte) & _PAGE_SPECIAL;
}
+static inline unsigned long pte_pfn(pte_t pte)
+{
+ return (pte_val(pte) & PTE_PFN_MASK) >> PAGE_SHIFT;
+}
+
+#define pte_page(pte) pfn_to_page(pte_pfn(pte))
+
static inline int pmd_large(pmd_t pte)
{
return (pmd_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==
static inline int pmd_large(pmd_t pte)
{
return (pmd_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==
@@
-313,6
+320,8
@@
static inline void native_pagetable_setup_start(pgd_t *base) {}
static inline void native_pagetable_setup_done(pgd_t *base) {}
#endif
static inline void native_pagetable_setup_done(pgd_t *base) {}
#endif
+extern int arch_report_meminfo(char *page);
+
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
#else /* !CONFIG_PARAVIRT */
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
#else /* !CONFIG_PARAVIRT */
@@
-521,4
+530,4
@@
static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-#endif /*
_ASM_X86
_PGTABLE_H */
+#endif /*
ASM_X86_
_PGTABLE_H */