ARM: entry: ensure that IRQs are enabled when calling syscall_trace_exit()
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 20 Aug 2015 16:39:32 +0000 (17:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Aug 2015 09:32:50 +0000 (10:32 +0100)
The audit code looks like it's been written to cope with being called
with IRQs enabled.  However, it's unclear whether IRQs should be
enabled or disabled when calling the syscall tracing infrastructure.

Right now, sometimes we call this with IRQs enabled, and other times
with IRQs disabled.  Opt for IRQs being enabled for consistency.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/entry-common.S

index dd3721d..d83a40d 100644 (file)
@@ -275,7 +275,7 @@ __sys_trace_return:
        b       ret_slow_syscall
 
 __sys_trace_return_nosave:
-       asm_trace_hardirqs_off save=0
+       enable_irq_notrace
        mov     r0, sp
        bl      syscall_trace_exit
        b       ret_slow_syscall