diff options
author | Dmitry Torokhov | 2017-05-30 04:54:21 +0200 |
---|---|---|
committer | Dmitry Torokhov | 2017-05-30 04:54:21 +0200 |
commit | d8f797c60661a90ee26ca9330cf85ede9aa2ec17 (patch) | |
tree | 5038609885fc3e4cb7f329d974875ac4411c6af5 /arch/m68k/mm | |
parent | Input: tsc2007 - move header file out of I2C realm (diff) | |
parent | Linux 4.12-rc3 (diff) | |
download | kernel-qcow2-linux-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.tar.gz kernel-qcow2-linux-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.tar.xz kernel-qcow2-linux-d8f797c60661a90ee26ca9330cf85ede9aa2ec17.zip |
Merge tag 'v4.12-rc3' into next
Sync with mainline to bring in changes in platform drovers dropping
calls to sparse_keymap_free() so that we can remove it for good.
Diffstat (limited to 'arch/m68k/mm')
-rw-r--r-- | arch/m68k/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index bd66a0b20c6b..2795e4ca09d7 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -32,7 +32,7 @@ int send_fault_sig(struct pt_regs *regs) force_sig_info(siginfo.si_signo, &siginfo, current); } else { - if (handle_kernel_fault(regs)) + if (fixup_exception(regs)) return -1; //if (siginfo.si_signo == SIGBUS) |