aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-09-06 08:09:03 +0100
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-09-06 08:09:03 +0100
commitb6ddc518520887a62728b0414efbf802a9dfdd55 (patch)
tree7527a85f79430e8862f19aecd5de42ad5b9fd1b7 /arch/ppc64
parentMerge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
downloadlinux-dev-b6ddc518520887a62728b0414efbf802a9dfdd55.tar.xz
linux-dev-b6ddc518520887a62728b0414efbf802a9dfdd55.zip
Fix build failure on ppc64 without CONFIG_AUDIT
We shouldn't call audit_syscall_exit() unless it actually exists. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/ppc64')
-rw-r--r--arch/ppc64/kernel/entry.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S
index ae5d563ad93a..14cd56ac40dd 100644
--- a/arch/ppc64/kernel/entry.S
+++ b/arch/ppc64/kernel/entry.S
@@ -282,6 +282,7 @@ _GLOBAL(ppc32_rt_sigsuspend)
bne syscall_exit
/* If sigsuspend() returns zero, we are going into a signal handler. We
may need to call audit_syscall_exit() to mark the exit from sigsuspend() */
+#ifdef CONFIG_AUDIT
ld r3,PACACURRENT(r13)
ld r4,AUDITCONTEXT(r3)
cmpdi 0,r4,0
@@ -289,6 +290,7 @@ _GLOBAL(ppc32_rt_sigsuspend)
li r4, 2 /* AUDITSC_FAILURE */
li r5,-4 /* It's always -EINTR */
bl .audit_syscall_exit
+#endif
b .ret_from_except
_GLOBAL(ppc_fork)