diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-22 00:32:51 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-22 00:32:51 +0200 |
| commit | 49047962ecf02d76bdaa378c00a51c9b829ac195 (patch) | |
| tree | 4e711bead6598486b033c4d2dbdb7f7c0dd6f23a /arch/parisc/kernel/traps.c | |
| parent | Merge tag 'topic/drm-misc-2016-04-21' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Linux 4.6-rc3 (diff) | |
| download | linux-49047962ecf02d76bdaa378c00a51c9b829ac195.tar.xz linux-49047962ecf02d76bdaa378c00a51c9b829ac195.zip | |
Merge tag 'v4.6-rc3' into drm-next
Backmerge 4.6-rc3 for i915.
Linux 4.6-rc3
Diffstat (limited to 'arch/parisc/kernel/traps.c')
| -rw-r--r-- | arch/parisc/kernel/traps.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 16e0735e2f46..97d6b208e129 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -795,6 +795,9 @@ void notrace handle_interruption(int code, struct pt_regs *regs) if (fault_space == 0 && !faulthandler_disabled()) { + /* Clean up and return if in exception table. */ + if (fixup_exception(regs)) + return; pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); parisc_terminate("Kernel Fault", regs, code, fault_address); } |