summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2015-02-20 20:57:37 +0300
committerJesper Nilsson <jespern@axis.com>2015-09-05 01:56:49 +0300
commit3fffa23ee0a348aef1b597b67626d4724667143b (patch)
treeedcabbe8a7c5899e3b8d14b44a58a8e55d4a6fa0 /arch/cris
parent444e0c2881bcc70db6833d9c653c6ced36813d3b (diff)
downloadlinux-3fffa23ee0a348aef1b597b67626d4724667143b.tar.xz
CRISv32: annotate irq enable in idle loop
Use a call to local_irq_enable() instead of incline asm so that the irqsoff latency tracer knows that interrupts are enabled here. Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/kernel/process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index cebd32e2a8fb..c7ce784a393c 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -23,9 +23,9 @@ extern void stop_watchdog(void);
/* We use this if we don't have any better idle routine. */
void default_idle(void)
{
+ local_irq_enable();
/* Halt until exception. */
- __asm__ volatile("ei \n\t"
- "halt ");
+ __asm__ volatile("halt");
}
/*