diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:30:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:30:45 -0400 |
| commit | d470c05bedc27dbd2df9d0bb6fd82336e4ff43db (patch) | |
| tree | e0dd12e061f6b2648e1ddac84eeb7232490f01e2 /arch/sh/mm/cache.c | |
| parent | ee67e6cbe1121da1ae4eceb7b2bcb535c5cbf65e (diff) | |
| parent | 457b646189e47f9d48588809da3e806ec363f219 (diff) | |
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix a TRACE_IRQS_OFF typo.
sh: Optimize the setup_rt_frame() I-cache flush.
sh: Populate initial secondary CPU info from boot_cpu_data.
sh: Tidy up SMP cpuinfo.
sh: Use boot_cpu_data for FPU tests in sigcontext paths.
sh: ftrace: Fix up syscall tracepoint support.
sh: force dcache flush if dcache_dirty bit set.
sh: update die() output.
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, | |||
| 128 | return; | 128 | return; |
| 129 | 129 | ||
| 130 | page = pfn_to_page(pfn); | 130 | page = pfn_to_page(pfn); |
| 131 | if (pfn_valid(pfn) && page_mapping(page)) { | 131 | if (pfn_valid(pfn)) { |
| 132 | int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags); | 132 | int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags); |
| 133 | if (dirty) { | 133 | if (dirty) { |
| 134 | unsigned long addr = (unsigned long)page_address(page); | 134 | unsigned long addr = (unsigned long)page_address(page); |