diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:25:41 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:25:41 +0900 |
commit | 18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c (patch) | |
tree | 84e178e4e475400f8e9a5c74f1e2cb35ee17fca4 /arch/openrisc/kernel/ptrace.c | |
parent | 02a650e2820e19fde8f6a49752027217fdd33d78 (diff) | |
parent | d23b5799b608112bb799c9b0e1e11ee1da692d76 (diff) | |
download | linux-next-18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c.tar.gz |
Merge tag 'for-3.7' of git://openrisc.net/jonas/linux
Pull OpenRISC updates from Jonas Bonn:
"Fixups for some corner cases, build issues, and some obvious bugs in
IRQ handling. No major changes."
* tag 'for-3.7' of git://openrisc.net/jonas/linux:
openrisc: mask interrupts in irq_mask_ack function
openrisc: fix typos in comments and warnings
openrisc: PIC should act on domain-local irqs
openrisc: Make cpu_relax() invoke barrier()
audit: define AUDIT_ARCH_OPENRISC
openrisc: delay: fix handling of counter overflow
openrisc: delay: fix loops calculation for __const_udelay
Diffstat (limited to 'arch/openrisc/kernel/ptrace.c')
-rw-r--r-- | arch/openrisc/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/kernel/ptrace.c b/arch/openrisc/kernel/ptrace.c index e71781d24b0e..71a2a0c34c65 100644 --- a/arch/openrisc/kernel/ptrace.c +++ b/arch/openrisc/kernel/ptrace.c @@ -187,7 +187,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) */ ret = -1L; - audit_syscall_entry(audit_arch(), regs->gpr[11], + audit_syscall_entry(AUDIT_ARCH_OPENRISC, regs->gpr[11], regs->gpr[3], regs->gpr[4], regs->gpr[5], regs->gpr[6]); |