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

Commit 082ff0a9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

[PATCH] mm/filemap_xip.c compilation fix



mm/filemap_xip.c: In function `__xip_unmap':
mm/filemap_xip.c:194: request for member `pte' in something not a structure or union

Apparently pte_pfn() takes a pte_t, not a pointer to a pte_t.  From looking
at asm/page.h, it seems to be the same on ia32 or ppc (iff
STRICT_MM_TYPECHECKS is enabled, which is disabled by default on ppc).

Acked-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent eb0a90b4
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -191,7 +191,7 @@ __xip_unmap (struct address_space * mapping,
					 address);
					 address);
		if (!IS_ERR(pte)) {
		if (!IS_ERR(pte)) {
			/* Nuke the page table entry. */
			/* Nuke the page table entry. */
			flush_cache_page(vma, address, pte_pfn(pte));
			flush_cache_page(vma, address, pte_pfn(*pte));
			pteval = ptep_clear_flush(vma, address, pte);
			pteval = ptep_clear_flush(vma, address, pte);
			BUG_ON(pte_dirty(pteval));
			BUG_ON(pte_dirty(pteval));
			pte_unmap(pte);
			pte_unmap(pte);