diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-27 08:40:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-17 02:19:15 +0100 |
| commit | c6fee0810df4e0f4cf9c4834d2569ca01c02cffc (patch) | |
| tree | 7b6adabf750ca0279895f8b9aa8a42eb9837e4e2 /arch/sparc/kernel/ptrace_64.c | |
| parent | sparc32,sun4m: percpu and global register definitions moved to irq.h (diff) | |
| download | linux-c6fee0810df4e0f4cf9c4834d2569ca01c02cffc.tar.xz linux-c6fee0810df4e0f4cf9c4834d2569ca01c02cffc.zip | |
sparc64: Fix build errors with gcc-4.6.0
Most of the warnings emitted (we fail arch/sparc file
builds with -Werror) were legitimate but harmless, however
one case (n2_pcr_write) was a genuine bug.
Based almost entirely upon a patch by Sam Ravnborg.
Reported-by: Dennis Gilmore <dennis@ausil.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/ptrace_64.c')
| -rw-r--r-- | arch/sparc/kernel/ptrace_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c index 9ccc812bc09e..96ee50a80661 100644 --- a/arch/sparc/kernel/ptrace_64.c +++ b/arch/sparc/kernel/ptrace_64.c @@ -1086,6 +1086,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) asmlinkage void syscall_trace_leave(struct pt_regs *regs) { +#ifdef CONFIG_AUDITSYSCALL if (unlikely(current->audit_context)) { unsigned long tstate = regs->tstate; int result = AUDITSC_SUCCESS; @@ -1095,7 +1096,7 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs) audit_syscall_exit(result, regs->u_regs[UREG_I0]); } - +#endif if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) trace_sys_exit(regs, regs->u_regs[UREG_G1]); |