git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MAINTAINERS - Remove x86/Voyager no longer in tree
[safe/jmp/linux-2.6]
/
arch
/
x86
/
mm
/
dump_pagetables.c
diff --git
a/arch/x86/mm/dump_pagetables.c
b/arch/x86/mm/dump_pagetables.c
index
2c24bea
..
e7277cb
100644
(file)
--- a/
arch/x86/mm/dump_pagetables.c
+++ b/
arch/x86/mm/dump_pagetables.c
@@
-42,7
+42,7
@@
static struct addr_marker address_markers[] = {
{ 0, "User Space" },
#ifdef CONFIG_X86_64
{ 0x8000000000000000UL, "Kernel Space" },
{ 0, "User Space" },
#ifdef CONFIG_X86_64
{ 0x8000000000000000UL, "Kernel Space" },
- {
0xffff810000000000UL,
"Low Kernel Mapping" },
+ {
PAGE_OFFSET,
"Low Kernel Mapping" },
{ VMALLOC_START, "vmalloc() Area" },
{ VMEMMAP_START, "Vmemmap" },
{ __START_KERNEL_map, "High Kernel Mapping" },
{ VMALLOC_START, "vmalloc() Area" },
{ VMEMMAP_START, "Vmemmap" },
{ __START_KERNEL_map, "High Kernel Mapping" },
@@
-148,8
+148,8
@@
static void note_page(struct seq_file *m, struct pg_state *st,
* we have now. "break" is either changing perms, levels or
* address space marker.
*/
* we have now. "break" is either changing perms, levels or
* address space marker.
*/
- prot = pgprot_val(new_prot) &
~(PTE_MASK)
;
- cur = pgprot_val(st->current_prot) &
~(PTE_MASK)
;
+ prot = pgprot_val(new_prot) &
PTE_FLAGS_MASK
;
+ cur = pgprot_val(st->current_prot) &
PTE_FLAGS_MASK
;
if (!st->level) {
/* First entry */
if (!st->level) {
/* First entry */
@@
-221,7
+221,7
@@
static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr,
for (i = 0; i < PTRS_PER_PMD; i++) {
st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT);
if (!pmd_none(*start)) {
for (i = 0; i < PTRS_PER_PMD; i++) {
st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT);
if (!pmd_none(*start)) {
- pgprotval_t prot = pmd_val(*start) &
~PTE
_MASK;
+ pgprotval_t prot = pmd_val(*start) &
PTE_FLAGS
_MASK;
if (pmd_large(*start) || !pmd_present(*start))
note_page(m, st, __pgprot(prot), 3);
if (pmd_large(*start) || !pmd_present(*start))
note_page(m, st, __pgprot(prot), 3);
@@
-253,7
+253,7
@@
static void walk_pud_level(struct seq_file *m, struct pg_state *st, pgd_t addr,
for (i = 0; i < PTRS_PER_PUD; i++) {
st->current_address = normalize_addr(P + i * PUD_LEVEL_MULT);
if (!pud_none(*start)) {
for (i = 0; i < PTRS_PER_PUD; i++) {
st->current_address = normalize_addr(P + i * PUD_LEVEL_MULT);
if (!pud_none(*start)) {
- pgprotval_t prot = pud_val(*start) &
~PTE
_MASK;
+ pgprotval_t prot = pud_val(*start) &
PTE_FLAGS
_MASK;
if (pud_large(*start) || !pud_present(*start))
note_page(m, st, __pgprot(prot), 2);
if (pud_large(*start) || !pud_present(*start))
note_page(m, st, __pgprot(prot), 2);
@@
-288,7
+288,7
@@
static void walk_pgd_level(struct seq_file *m)
for (i = 0; i < PTRS_PER_PGD; i++) {
st.current_address = normalize_addr(i * PGD_LEVEL_MULT);
if (!pgd_none(*start)) {
for (i = 0; i < PTRS_PER_PGD; i++) {
st.current_address = normalize_addr(i * PGD_LEVEL_MULT);
if (!pgd_none(*start)) {
- pgprotval_t prot = pgd_val(*start) &
~PTE
_MASK;
+ pgprotval_t prot = pgd_val(*start) &
PTE_FLAGS
_MASK;
if (pgd_large(*start) || !pgd_present(*start))
note_page(m, &st, __pgprot(prot), 1);
if (pgd_large(*start) || !pgd_present(*start))
note_page(m, &st, __pgprot(prot), 1);