summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-04-26 14:14:52 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-04-26 14:14:52 +0200
commit924a158a12c7e732179dd85ddd20848039e7bd71 (patch)
tree312cf5182eb23f598fb3b8abff0b1220303bd10f
parentPM/Hibernate: Fix waiting for image device to appear on resume (diff)
downloadlinux-924a158a12c7e732179dd85ddd20848039e7bd71.tar.xz
linux-924a158a12c7e732179dd85ddd20848039e7bd71.zip
[ARM] Convert pmd_page() to be highmem safe
In the long run, we may want to place page tables in highmem. However, pmd_page() has traditionally been coded to convert the physical address to a virtual one, which won't work with highmem pages. Instead, translate the physical address to a PFN, and then convert the PFN to a struct page instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/include/asm/pgtable.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 110295c5461d..1cd2d6416bda 100644
--- 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,