From 315a57113bc8092377042ce13d0802c74ae3e1c0 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Tue, 6 Sep 2005 08:09:03 +0100
Subject: [PATCH] --- yaml --- r: 8895 b: refs/heads/master c:
 b6ddc518520887a62728b0414efbf802a9dfdd55 h: refs/heads/master i:   8893:
 844f84fde69d25b6235d164587a0478865ff531e   8891:
 1b34751fb1df788663e894aa2ae7e8d46433cdb0   8887:
 72d3536d166cbd6320692788377790c2d8ac89cd   8879:
 3c34457bac2692bca287533d87b68d7739a9f19d   8863:
 1fb9314d013dec71386c4cf8834a037fe6539213   8831:
 31da5f02e04af640010609ebbb7718a640c126f3 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/ppc64/kernel/entry.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 05d3b98e550d..16a3d31868bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efda9452046bdd707b23a85b7846ec33548f84f1
+refs/heads/master: b6ddc518520887a62728b0414efbf802a9dfdd55
diff --git a/trunk/arch/ppc64/kernel/entry.S b/trunk/arch/ppc64/kernel/entry.S
index ae5d563ad93a..14cd56ac40dd 100644
--- a/trunk/arch/ppc64/kernel/entry.S
+++ b/trunk/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)