aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/kernel/traps.c
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2017-11-02 11:19:15 -0500
committerCorey Minyard <cminyard@mvista.com>2017-11-02 11:19:15 -0500
commit6297fabd93f93182245383ba7de56bef829a796b (patch)
tree804f5d28ada61b402d56281c9a047308d26347f4 /arch/m32r/kernel/traps.c
parentd7e17fe4f7a7d961cc4375c7d868bd353a039bc7 (diff)
parentece1996a21eeb344b49200e627c6660111009c10 (diff)
downloadkernel_replicant_linux-6297fabd93f93182245383ba7de56bef829a796b.tar.gz
kernel_replicant_linux-6297fabd93f93182245383ba7de56bef829a796b.tar.bz2
kernel_replicant_linux-6297fabd93f93182245383ba7de56bef829a796b.zip
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module tree to accountfor that. Signed-off-by: Corey Minyard <cminyard@mvista.com>
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();