diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-08 21:45:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-08 21:45:16 -0500 |
commit | da2d96d3aa181c367ac4fcb9c11ee5eb15697cdd (patch) | |
tree | 7d6f4a95c4fcc2a1f8dcdf4701168db047352b4e | |
parent | cdecbb336e64b8a846bf97c5a275dc94fdb1083d (diff) | |
parent | a3248d609bd4514932bac291356e6a89abf259bc (diff) |
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
-rw-r--r-- | arch/nios2/mm/fault.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c index 34429d5a0ccd..d194c0427b26 100644 --- a/arch/nios2/mm/fault.c +++ b/arch/nios2/mm/fault.c | |||
@@ -159,9 +159,11 @@ bad_area: | |||
159 | bad_area_nosemaphore: | 159 | bad_area_nosemaphore: |
160 | /* User mode accesses just cause a SIGSEGV */ | 160 | /* User mode accesses just cause a SIGSEGV */ |
161 | if (user_mode(regs)) { | 161 | if (user_mode(regs)) { |
162 | pr_alert("%s: unhandled page fault (%d) at 0x%08lx, " | 162 | if (unhandled_signal(current, SIGSEGV) && printk_ratelimit()) { |
163 | "cause %ld\n", current->comm, SIGSEGV, address, cause); | 163 | pr_info("%s: unhandled page fault (%d) at 0x%08lx, " |
164 | show_regs(regs); | 164 | "cause %ld\n", current->comm, SIGSEGV, address, cause); |
165 | show_regs(regs); | ||
166 | } | ||
165 | _exception(SIGSEGV, regs, code, address); | 167 | _exception(SIGSEGV, regs, code, address); |
166 | return; | 168 | return; |
167 | } | 169 | } |