git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
pgtable.h
diff --git
a/arch/arm/include/asm/pgtable.h
b/arch/arm/include/asm/pgtable.h
index
110295c
..
1cd2d64
100644
(file)
--- a/
arch/arm/include/asm/pgtable.h
+++ b/
arch/arm/include/asm/pgtable.h
@@
-342,7
+342,7
@@
static inline pte_t *pmd_page_vaddr(pmd_t pmd)
return __va(ptr);
}
-#define pmd_page(pmd)
virt_to_page(__va
(pmd_val(pmd)))
+#define pmd_page(pmd)
pfn_to_page(__phys_to_pfn
(pmd_val(pmd)))
/*
* Conversion functions: convert a page and protection to a page entry,