浏览代码

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>
Russell King 10 年之前
父节点
当前提交
e0aa3a6657
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/arm/kernel/entry-common.S

+ 1 - 1
arch/arm/kernel/entry-common.S

@@ -275,7 +275,7 @@ __sys_trace_return:
 	b	ret_slow_syscall
 	b	ret_slow_syscall
 
 
 __sys_trace_return_nosave:
 __sys_trace_return_nosave:
-	asm_trace_hardirqs_off save=0
+	enable_irq_notrace
 	mov	r0, sp
 	mov	r0, sp
 	bl	syscall_trace_exit
 	bl	syscall_trace_exit
 	b	ret_slow_syscall
 	b	ret_slow_syscall