aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/kernel/traps.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2017-11-15 16:56:11 -0800
committerDan Williams <dan.j.williams@intel.com>2017-11-15 16:56:11 -0800
commit4247f24c23589bcc3bc3490515ef8c9497e9ae55 (patch)
tree89726a0e171c443a3e8def2992b56dbd8a21df21 /arch/m32r/kernel/traps.c
parent79ab67ede21f536851a99ea68ee6fc1f5435e055 (diff)
parent9f586fff6574f6ecbf323f92d44ffaf0d96225fe (diff)
downloadkernel_replicant_linux-4247f24c23589bcc3bc3490515ef8c9497e9ae55.tar.gz
kernel_replicant_linux-4247f24c23589bcc3bc3490515ef8c9497e9ae55.tar.bz2
kernel_replicant_linux-4247f24c23589bcc3bc3490515ef8c9497e9ae55.zip
Merge branch 'for-4.15/dax' into libnvdimm-for-next
Diffstat (limited to 'arch/m32r/kernel/traps.c')
-rw-r--r--arch/m32r/kernel/traps.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
index 647dd94a0c39..72b96f282689 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -114,6 +114,15 @@ static void set_eit_vector_entries(void)
_flush_cache_copyback_all();
}
+void abort(void)
+{
+ BUG();
+
+ /* if that doesn't kill us, halt */
+ panic("Oops failed to kill thread");
+}
+EXPORT_SYMBOL(abort);
+
void __init trap_init(void)
{
set_eit_vector_entries();