From 31c80560ac47b208143dba4d33e76d35f9642ca8 Mon Sep 17 00:00:00 2001 From: Nitin Gupta Date: Mon, 12 Oct 2009 14:20:23 +0530 Subject: [PATCH] --- yaml --- r: 167378 b: refs/heads/master c: 787b2faadc4356b6c2c71feb42fb944fece9a12f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/fault-armv.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5024ea5613ac..544c6bd42f86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edc72786d208e77db94f84dcb0d166c0d23d82f7 +refs/heads/master: 787b2faadc4356b6c2c71feb42fb944fece9a12f diff --git a/trunk/arch/arm/mm/fault-armv.c b/trunk/arch/arm/mm/fault-armv.c index bc0099d5ae85..d0d17b6a3703 100644 --- a/trunk/arch/arm/mm/fault-armv.c +++ b/trunk/arch/arm/mm/fault-armv.c @@ -153,14 +153,11 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, pte_t pte) page = pfn_to_page(pfn); mapping = page_mapping(page); - if (mapping) { #ifndef CONFIG_SMP - int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags); - - if (dirty) - __flush_dcache_page(mapping, page); + if (test_and_clear_bit(PG_dcache_dirty, &page->flags)) + __flush_dcache_page(mapping, page); #endif - + if (mapping) { if (cache_is_vivt()) make_coherent(mapping, vma, addr, pfn); else if (vma->vm_flags & VM_EXEC)