Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da2d96d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cdecbb33 a3248d60

arch/nios2/mm/fault.c

+5 −3
Original line number Diff line number Diff line
@@ -159,9 +159,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause, 
bad_area_nosemaphore:

	/* User mode accesses just cause a SIGSEGV */

	if (user_mode(regs)) {

		pr_alert("%s: unhandled page fault (%d) at 0x%08lx, "

		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;

	}