diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 17:46:18 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-29 14:25:49 +1000 |
| commit | 8b150478aeb1a8edb9015c2f7ac4da637ff65c45 (patch) | |
| tree | 621b038b9c041fe82b708c6c5cbee655be2a519a /drivers/video/fbmem.c | |
| parent | d49b340124a34fcb8bceda472558ccef7232c16f (diff) | |
| download | blackbird-op-linux-8b150478aeb1a8edb9015c2f7ac4da637ff65c45.tar.gz blackbird-op-linux-8b150478aeb1a8edb9015c2f7ac4da637ff65c45.zip | |
[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 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 70be7009f8af..ca02aa2bfcec 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -918,7 +918,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma) } #endif #elif defined(__powerpc__) - vma->vm_page_prot = phys_mem_access_prot(file, off, + vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT, vma->vm_end - vma->vm_start, vma->vm_page_prot); #elif defined(__alpha__) |
