aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-08-20 17:39:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-08-25 10:32:50 +0100
commite0aa3a665782e29cec752ae667c51ed4ee75d11f (patch)
tree64b38285f86f12887ee8238b3aba1e7977718e77 /arch/arm/kernel
parent3302caddf10ad50710dbb7a94ccbdb3ad5bf1412 (diff)
downloadlinux-linaro-stable-e0aa3a665782e29cec752ae667c51ed4ee75d11f.tar.gz
ARM: entry: ensure that IRQs are enabled when calling syscall_trace_exit()
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>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/entry-common.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index dd3721d1185e..d83a40d8e055 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -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