diff options
author | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-06-07 12:12:25 -0400 |
commit | bea6412a994a8f49d81bc103907563ab9f94c371 (patch) | |
tree | 93afcafccce0f149d4221ec4bb6156dcdafdb0e5 /arch/arm64/mm/fault.c | |
parent | 82c5cde1c4b01a62c9a19c9118b4b434c333ce86 (diff) | |
parent | 49006bfd31f728a0dfdef6ef41635f0e6c546155 (diff) |
Merge branch 'am33xx' into omap-for-v3.11/cleanup
Diffstat (limited to 'arch/arm64/mm/fault.c')
-rw-r--r-- | arch/arm64/mm/fault.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 98af6e760cce..1426468b77f3 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c | |||
@@ -113,7 +113,8 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr, | |||
113 | { | 113 | { |
114 | struct siginfo si; | 114 | struct siginfo si; |
115 | 115 | ||
116 | if (show_unhandled_signals) { | 116 | if (show_unhandled_signals && unhandled_signal(tsk, sig) && |
117 | printk_ratelimit()) { | ||
117 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", | 118 | pr_info("%s[%d]: unhandled %s (%d) at 0x%08lx, esr 0x%03x\n", |
118 | tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, | 119 | tsk->comm, task_pid_nr(tsk), fault_name(esr), sig, |
119 | addr, esr); | 120 | addr, esr); |