Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a10a60 authored by Franck Bui-Huu's avatar Franck Bui-Huu Committed by Linus Torvalds
Browse files

[PATCH] Fix up mmap_kmem



vma->vm_pgoff is an pfn _offset_ relatif to the begining
of the memory start. The previous code was doing at first:

	vma->vm_pgoff << PAGE_SHIFT

which results into a wrong physical address since some
platforms have a physical mem start that can be different
from 0. After that the previous call __pa() on this
wrong physical address, however __pa() is used to convert
a _virtual_ address into a physical one.

This patch rewrites this convertion. It calculates the
pfn of PAGE_OFFSET which is the pfn of the mem start
then it adds the vma->vm_pgoff to it.

It also uses virt_to_phys() instead of __pa() since the
latter shouldn't be used by drivers.

Signed-off-by: default avatarFranck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a5344a95
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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