summaryrefslogtreecommitdiff
path: root/arch/m32r/kernel
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2017-10-26 22:24:15 +0200
committerWolfram Sang <wsa@the-dreams.de>2017-10-26 22:24:15 +0200
commit3990bedea6e96cb1f182dbeadd62215dbb9e1c85 (patch)
tree90ac0ab8ae1d4339dc17eb42a853042ea06d6b13 /arch/m32r/kernel
parent631de7a4603439eaa1d7a2a1a7b5b49edcd87f67 (diff)
parent3997fb74846f35d0364c5e88e54bc9b166d5a1bc (diff)
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.15
This cycle has been real quiet for me. There's only the one trivial patch that somewhat simplifies DT parsing in the i2c-mux-reg driver.
Diffstat (limited to 'arch/m32r/kernel')
-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();