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

Commit 0d6d82b6 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

[PATCH] sh: Use pfn_valid() for lazy dcache write-back on SH7705



SH7705 in extended cache mode has some left-over VALID_PAGE() cruft that it
checks when doing lazy dcache write-back.  This has been gone for some time
(the last bits were in the discontig code, which should now also be gone --
this also fixes up a build error in the non-discontig case).

pfn_valid() gives the desired behaviour, so we switch to that.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 65463b73
Loading
Loading
Loading
Loading
+12 −7
Original line number Diff line number Diff line
@@ -40,13 +40,18 @@ void update_mmu_cache(struct vm_area_struct * vma,
		return;

#if defined(CONFIG_SH7705_CACHE_32KB)
	struct page *page;
	page = pte_page(pte);
	if (VALID_PAGE(page) && !test_bit(PG_mapped, &page->flags)) {
	{
		struct page *page = pte_page(pte);
		unsigned long pfn = pte_pfn(pte);

		if (pfn_valid(pfn) && !test_bit(PG_mapped, &page->flags)) {
			unsigned long phys = pte_val(pte) & PTE_PHYS_MASK;
		__flush_wback_region((void *)P1SEGADDR(phys), PAGE_SIZE);

			__flush_wback_region((void *)P1SEGADDR(phys),
					     PAGE_SIZE);
			__set_bit(PG_mapped, &page->flags);
		}
	}
#endif

	local_irq_save(flags);