1 files changed, 7 insertions, 3 deletions

diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c
index 15a0bb5fc06d..d194c0427b26 100644
--- a/arch/nios2/mm/fault.c
+++ b/arch/nios2/mm/fault.c
@@ -135,6 +135,8 @@ survive:
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 if (fault & VM_FAULT_OOM)
                         goto out_of_memory;
+                else if (fault & VM_FAULT_SIGSEGV)
+                        goto bad_area;
                 else if (fault & VM_FAULT_SIGBUS)
                         goto do_sigbus;
                 BUG();
@@ -157,9 +159,11 @@ bad_area:
 bad_area_nosemaphore:
         /* User mode accesses just cause a SIGSEGV */
         if (user_mode(regs)) {
-                pr_alert("%s: unhandled page fault (%d) at 0x%08lx, "
-                        "cause %ld\n", current->comm, SIGSEGV, address, cause);
-                show_regs(regs);
+                if (unhandled_signal(current, SIGSEGV) && printk_ratelimit()) {
+                        pr_info("%s: unhandled page fault (%d) at 0x%08lx, "
+                                "cause %ld\n", current->comm, SIGSEGV, address, cause);
+                        show_regs(regs);
+                }
                 _exception(SIGSEGV, regs, code, address);
                 return;
         }