diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-13 11:27:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-13 11:27:08 +0900 |
| commit | 95019b48addc014c7de6653517663527a1747fb7 (patch) | |
| tree | 5488066e45e8e9de1fef431f39a93cd2d5967b61 /arch/sh | |
| parent | 7a0064d67215c53dce56839c82db504d0a066b79 (diff) | |
| parent | 964f7e5a56814b32c727821de77d22bd7ef782bc (diff) | |
| download | linux-95019b48addc014c7de6653517663527a1747fb7.tar.bz2 | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/traps_32.c | 7 | ||||
| -rw-r--r-- | arch/sh/mm/cache.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c index e0b5e4b5accd..7a2ee3a6b8e7 100644 --- a/arch/sh/kernel/traps_32.c +++ b/arch/sh/kernel/traps_32.c @@ -25,6 +25,7 @@ #include <linux/kexec.h> #include <linux/limits.h> #include <linux/proc_fs.h> +#include <linux/sysfs.h> #include <asm/system.h> #include <asm/uaccess.h> #include <asm/fpu.h> @@ -159,12 +160,12 @@ void die(const char * str, struct pt_regs * regs, long err) oops_enter(); - console_verbose(); spin_lock_irq(&die_lock); + console_verbose(); bust_spinlocks(1); printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); - + sysfs_printk_last_file(); print_modules(); show_regs(regs); @@ -180,6 +181,7 @@ void die(const char * str, struct pt_regs * regs, long err) bust_spinlocks(0); add_taint(TAINT_DIE); spin_unlock_irq(&die_lock); + oops_exit(); if (kexec_should_crash(current)) crash_kexec(regs); @@ -190,7 +192,6 @@ void die(const char * str, struct pt_regs * regs, long err) if (panic_on_oops) panic("Fatal exception"); - oops_exit(); do_exit(SIGSEGV); } diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c index 4aa926054531..e8810f7fc7ea 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); |