diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:44:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 08:44:44 +0200 |
commit | b226f744d40b052ac126c4cb16c76f66e5185128 (patch) | |
tree | e86f5c059dde241472689cbe2d55429cd15b2d56 /arch/sh/mm/cache.c | |
parent | d5b889f2ecec7849e851ddd31c34bdfb3482b5de (diff) | |
parent | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (diff) | |
download | linux-next-b226f744d40b052ac126c4cb16c76f66e5185128.tar.gz |
Merge branch 'linus' into perf/core
Merge reason: pick up tools/perf/ changes from upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/mm/cache.c')
-rw-r--r-- | arch/sh/mm/cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c index 35c37b7f717a..5e1091be9dc4 100644 --- a/arch/sh/mm/cache.c +++ b/arch/sh/mm/cache.c @@ -128,7 +128,7 @@ void __update_cache(struct vm_area_struct *vma, return; page = pfn_to_page(pfn); - if (pfn_valid(pfn) && page_mapping(page)) { + if (pfn_valid(pfn)) { int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags); if (dirty) { unsigned long addr = (unsigned long)page_address(page); |