diff --git a/[refs] b/[refs]
index f5465e08139e..acff601d9f90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5344a9555fffd045218aced89afd6ca0f884e10
+refs/heads/master: 99a10a60ba9bedcf5d70ef81414d3e03816afa3f
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index 6511012cbdcd..a89cb52228c2 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -292,8 +292,8 @@ static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
 {
 	unsigned long pfn;
 
-	/* Turn a kernel-virtual address into a physical page frame */
-	pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT;
+	/* Turn a pfn offset into an absolute pfn */
+	pfn = PFN_DOWN(virt_to_phys((void *)PAGE_OFFSET)) + vma->vm_pgoff;
 
 	/*
 	 * RED-PEN: on some architectures there is more mapped memory