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

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

Linus Torvalds committed 11 years ago

Commit da2d96d2 parents cdecbb3 a3248d61 file · +5 −3Browse files

Unified · Split

arch/nios2/mm/fault.c+5−3

@@ -159,9 +159,11 @@ bad_area: · 158 unmodified lines
159	159	bad_area_nosemaphore:
160	160	/* User mode accesses just cause a SIGSEGV */
161	161	if (user_mode(regs)) {
162		− pr_alert("%s: unhandled page fault (%d) at 0x%08lx, "
163		− "cause %ld\n", current->comm, SIGSEGV, address, cause);
164		− show_regs(regs);
	162	+ if (unhandled_signal(current, SIGSEGV) && printk_ratelimit()) {
	163	+ pr_info("%s: unhandled page fault (%d) at 0x%08lx, "
	164	+ "cause %ld\n", current->comm, SIGSEGV, address, cause);
	165	+ show_regs(regs);
	166	+ }
165	167	_exception(SIGSEGV, regs, code, address);
166	168	return;
167	169	}