Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / arch / csky / abiv2 / cacheflush.c

diff --git a/arch/csky/abiv2/cacheflush.c b/arch/csky/abiv2/cacheflush.c
index 790f1ebfba44ba925ccd94f1927b61e03137dbc6..39c51399dd81da57ef4d9c580bd31bdf5e2b6f0b 100644 (file)
--- a/arch/csky/abiv2/cacheflush.c
+++ b/arch/csky/abiv2/cacheflush.c
@@ -12,6 +12,9 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
        unsigned long addr;
        struct page *page;
 
+       if (!pfn_valid(pte_pfn(*pte)))
+               return;
+
        page = pfn_to_page(pte_pfn(*pte));
        if (page == ZERO_PAGE(0))
                return;