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-2level.h
diff --git
a/include/asm-x86/pgtable-2level.h
b/include/asm-x86/pgtable-2level.h
index
46bc52c
..
8176208
100644
(file)
--- a/
include/asm-x86/pgtable-2level.h
+++ b/
include/asm-x86/pgtable-2level.h
@@
-1,5
+1,5
@@
-#ifndef
_I386
_PGTABLE_2LEVEL_H
-#define
_I386
_PGTABLE_2LEVEL_H
+#ifndef
ASM_X86_
_PGTABLE_2LEVEL_H
+#define
ASM_X86_
_PGTABLE_2LEVEL_H
#define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)
#define pte_ERROR(e) \
printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)
@@
-53,9
+53,7
@@
static inline pte_t native_ptep_get_and_clear(pte_t *xp)
#define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp)
#endif
#define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp)
#endif
-#define pte_page(x) pfn_to_page(pte_pfn(x))
#define pte_none(x) (!(x).pte_low)
#define pte_none(x) (!(x).pte_low)
-#define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT)
/*
* Bits 0, 6 and 7 are taken, split up the 29 bits of offset
/*
* Bits 0, 6 and 7 are taken, split up the 29 bits of offset
@@
-78,4
+76,4
@@
static inline pte_t native_ptep_get_and_clear(pte_t *xp)
#define __pte_to_swp_entry(pte) ((swp_entry_t) { (pte).pte_low })
#define __swp_entry_to_pte(x) ((pte_t) { .pte = (x).val })
#define __pte_to_swp_entry(pte) ((swp_entry_t) { (pte).pte_low })
#define __swp_entry_to_pte(x) ((pte_t) { .pte = (x).val })
-#endif /*
_I386
_PGTABLE_2LEVEL_H */
+#endif /*
ASM_X86_
_PGTABLE_2LEVEL_H */