Commit f93a1a00 authored by Al Cooper's avatar Al Cooper Committed by Ralf Baechle

MIPS: Fix crash that occurs when function tracing is enabled

A recent patch changed some irq routines from inlines to functions.
These routines are called by the tracer code. Now that they're functions,
if they are compiled for function tracing they will call the tracer
and crash the system due to infinite recursion. The fix disables
tracing in these functions by using "notrace" in the function
definition.
Signed-off-by: default avatarAl Cooper <alcooperx@gmail.com>
Reviewed-by: default avatarDavid Daney <david.daney@cavium.com>
Pathchwork: https://patchwork.linux-mips.org/patch/4564/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0ec7ec75
...@@ -56,7 +56,7 @@ __asm__( ...@@ -56,7 +56,7 @@ __asm__(
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
void arch_local_irq_disable(void) notrace void arch_local_irq_disable(void)
{ {
preempt_disable(); preempt_disable();
__asm__ __volatile__( __asm__ __volatile__(
...@@ -93,7 +93,7 @@ __asm__( ...@@ -93,7 +93,7 @@ __asm__(
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
unsigned long arch_local_irq_save(void) notrace unsigned long arch_local_irq_save(void)
{ {
unsigned long flags; unsigned long flags;
preempt_disable(); preempt_disable();
...@@ -135,7 +135,7 @@ __asm__( ...@@ -135,7 +135,7 @@ __asm__(
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
void arch_local_irq_restore(unsigned long flags) notrace void arch_local_irq_restore(unsigned long flags)
{ {
unsigned long __tmp1; unsigned long __tmp1;
...@@ -159,7 +159,7 @@ void arch_local_irq_restore(unsigned long flags) ...@@ -159,7 +159,7 @@ void arch_local_irq_restore(unsigned long flags)
EXPORT_SYMBOL(arch_local_irq_restore); EXPORT_SYMBOL(arch_local_irq_restore);
void __arch_local_irq_restore(unsigned long flags) notrace void __arch_local_irq_restore(unsigned long flags)
{ {
unsigned long __tmp1; unsigned long __tmp1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment