initial check-in of kp49 work (up to commit date)
[kernel-bfs] / kernel-bfs-2.6.28 / debian / patches / update_mmu_cache_arm.diff
1 ---
2  arch/arm/mm/fault-armv.c |    9 +++------
3  1 files changed, 3 insertions(+), 6 deletions(-)
4
5 Index: kernel-power-2.6.28/arch/arm/mm/fault-armv.c
6 ===================================================================
7 --- kernel-power-2.6.28.orig/arch/arm/mm/fault-armv.c
8 +++ kernel-power-2.6.28/arch/arm/mm/fault-armv.c
9 @@ -150,14 +150,11 @@
10  
11         page = pfn_to_page(pfn);
12         mapping = page_mapping(page);
13 -       if (mapping) {
14  #ifndef CONFIG_SMP
15 -               int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags);
16 -
17 -               if (dirty)
18 -                       __flush_dcache_page(mapping, page);
19 +       if (test_and_clear_bit(PG_dcache_dirty, &page->flags))
20 +               __flush_dcache_page(mapping, page);
21  #endif
22 -
23 +       if (mapping) {
24                 if (cache_is_vivt())
25                         make_coherent(mapping, vma, addr, pfn);
26                 else if (vma->vm_flags & VM_EXEC)