Skip to content

Commit

Permalink
Merge tag 'nios2-fixes-v3.19-final' of git://git.rocketboards.org/lin…
Browse files Browse the repository at this point in the history
…ux-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
  • Loading branch information
Linus Torvalds committed Feb 9, 2015
2 parents cdecbb3 + a3248d6 commit da2d96d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions arch/nios2/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
"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;
}
Expand Down

0 comments on commit da2d96d

Please sign in to comment.