From 8d3ed5021aa1c2e2077ea7a000ec3601b529d501 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 22 Jan 2007 08:53:24 -0800 Subject: [PATCH] --- yaml --- r: 45506 b: refs/heads/master c: 6d3154cc1143f62c3b80d9929caeaec6db8cb451 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/mem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6e22d2c4322..f158aa91748c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8b3485287731978899ced11f24628c927890e78 +refs/heads/master: 6d3154cc1143f62c3b80d9929caeaec6db8cb451 diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c index 4f1813e04754..f5c160caf9f4 100644 --- a/trunk/drivers/char/mem.c +++ b/trunk/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