lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/pat2

Browse Source 
Conflicts:
	arch/x86/mm/init_64.c
This commit is contained in:
Ingo Molnar
2008-10-10 19:30:08 +02:00
parent b27a43c1e9 d403a6484f
commit 3dd392a407
819 changed files with 9576 additions and 5697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/asm-x86/pgtable.h
View File

@@ -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
@@ -199,6 +199,13 @@ static inline int pte_special(pte_t pte)
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)) ==
@@ -326,6 +333,8 @@ static inline void native_pagetable_setup_start(pgd_t *base) {}
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 */
@@ -534,4 +543,4 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
#endif /* _ASM_X86_PGTABLE_H */
#endif /* ASM_X86__PGTABLE_H */