aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2005-10-28 20:46:18 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-29 00:25:49 -0400
commit8b150478aeb1a8edb9015c2f7ac4da637ff65c45 (patch)
tree621b038b9c041fe82b708c6c5cbee655be2a519a /include/asm-powerpc
parentd49b340124a34fcb8bceda472558ccef7232c16f (diff)
[PATCH] ppc: make phys_mem_access_prot() work with pfns instead of addresses
Change the phys_mem_access_prot() function to take a pfn instead of an address. This allows mmap64() to work on /dev/mem for addresses above 4G on 32-bit architectures. We start with a pfn in mmap_mem(), so there's no need to convert to an address; in fact, it's actively bad, since the conversion can overflow when the address is above 4G. Similarly fix the ppc32 page_is_ram() function to avoid a conversion to an address by directly comparing to max_pfn. Working with max_pfn instead of high_memory fixes page_is_ram() to give the right answer for highmem pages. Signed-off-by: Roland Dreier <rolandd@cisco.com> Cc: Anton Blanchard <anton@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/machdep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 706508b1b04b..451b345cfc78 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -144,7 +144,7 @@ struct machdep_calls {
144 144
145 /* Get access protection for /dev/mem */ 145 /* Get access protection for /dev/mem */
146 pgprot_t (*phys_mem_access_prot)(struct file *file, 146 pgprot_t (*phys_mem_access_prot)(struct file *file,
147 unsigned long offset, 147 unsigned long pfn,
148 unsigned long size, 148 unsigned long size,
149 pgprot_t vma_prot); 149 pgprot_t vma_prot);
150 150