X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fchar%2Fmem.c;h=f5c160caf9f480978db2cb0698192268433370ae;hb=2e175a90047a2dbc76fde169c990164895b25dfc;hp=4f1813e04754117c5f046ff12513b8464339791a;hpb=fb7665544dd60e016494cd5531f5b65ddae22ddc;p=powerpc.git diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 4f1813e047..f5c160caf9 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -293,8 +293,8 @@ static int mmap_kmem(struct file * file, struct vm_area_struct * vma) { unsigned long pfn; - /* Turn a pfn offset into an absolute pfn */ - pfn = PFN_DOWN(virt_to_phys((void *)PAGE_OFFSET)) + vma->vm_pgoff; + /* Turn a kernel-virtual address into a physical page frame */ + pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT; /* * RED-PEN: on some architectures there is more mapped memory