diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:48 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:44:48 -0500 |
| commit | 18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b (patch) | |
| tree | c4a4a9a0455c00edf16689cf0252c82c52d518db /drivers/video/fbmem.c | |
| parent | c4811b151b6584a668de8ae59eb71c4890b9ad94 (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
Merge branch 'master'
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 9073be4221a..e2667ddab3f 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__) |