Merge tag 'nios2-fixes-v3.19-final' of git://git.rocketboards.org/linux-socfpga-next

da2d96d3 · Linus Torvalds <[email protected]> · 2015-02-08 18:45:16 -08:00

Pull nios2 fix from Ley Foon Tan:
 "This fixes incorrect behavior of some user programs"

* tag 'nios2-fixes-v3.19-final' of git://git.rocketboards.org/linux-socfpga-next:
  nios2: fix unhandled signals

Commit: da2d96d3aa181c367ac4fcb9c11ee5eb15697cdd
Parents: cdecbb33 · a3248d60

Merge commit. Changes below are compared with the first parent: cdecbb33.

Changes

1 files changed · +5 −3

File	Status	Add	Del	Content
arch/nios2/mm/fault.c	modified	+5	−3	View file

arch/nios2/mm/fault.c

View file

diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c
index 34429d5..d194c04 100644
--- a/arch/nios2/mm/fault.c
+++ b/arch/nios2/mm/fault.c
@@ -159,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;
 	}