mm/filemap_xip.c compilation failure

mm/filemap_xip.c compilation failure

[Geert Uytterhoeven]

	Hi Carsten,

While cross-compiling a kernel for m68k, I stumbled across this
compilation error:

| 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).

Disclaimer: the patch below is untested, except for a compile test.

--- linux-2.6.13-rc2/mm/filemap_xip.c.orig	2005-06-29 22:15:45.000000000 +0200
+++ linux-2.6.13-rc2/mm/filemap_xip.c	2005-07-12 15:36:11.000000000 +0200
@@ -191,7 +191,7 @@ __xip_unmap (struct address_space * mapp
 					 address);
 		if (!IS_ERR(pte)) {
 			/* 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);
 			BUG_ON(pte_dirty(pteval));
 			pte_unmap(pte);

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds