Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 082ff0a9991dcea958785115fbba6dddd0dc280a

Authored by Geert Uytterhoeven
Committed by Linus Torvalds
1 parent eb0a90b497
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[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: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -191,7 +191,7 @@
191 191 address);
192 192 if (!IS_ERR(pte)) {
193 193 /* Nuke the page table entry. */
194   - flush_cache_page(vma, address, pte_pfn(pte));
  194 + flush_cache_page(vma, address, pte_pfn(*pte));
195 195 pteval = ptep_clear_flush(vma, address, pte);
196 196 BUG_ON(pte_dirty(pteval));
197 197 pte_unmap(pte);