diff --git a/[refs] b/[refs] index cf756b0fa2ad..c22222492b53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ed6e129390fb872c3b7e05a232e5d380fbdfb48 +refs/heads/master: 700487c158163f14e6ff10de770b565c1c993c69 diff --git a/trunk/arch/sh/mm/pg-mmu.c b/trunk/arch/sh/mm/pg-mmu.c index 8602f68af4c8..32351206edd3 100644 --- a/trunk/arch/sh/mm/pg-mmu.c +++ b/trunk/arch/sh/mm/pg-mmu.c @@ -37,6 +37,8 @@ static inline void *kmap_coherent(struct page *page, unsigned long addr) unsigned long vaddr, flags; pte_t pte; + BUG_ON(test_bit(PG_dcache_dirty, &page->flags)); + inc_preempt_count(); idx = (addr & current_cpu_data.dcache.alias_mask) >> PAGE_SHIFT;