[PATCH] audit_sysctl_exit can only be used with CONF_AUDIT_SYSCTL

This section of code calls .audit_syscal_exit, but is inside CONFIG_AUDIT,
so it will fail to build if CONFIG_AUDITSYSCALL is not defined.

After discussion with David Woodhouse, change the ifdef to
CONFIG_AUDITSYSCALL

Signed-off-by: Horms <horms@verge.net.au>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 984a106307147fea6b3f981402b0f0bcd5b96002..2d22bf03484ee2b47ab46b19d5209b579fcfd17f 100644 (file)
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -279,7 +279,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
+#ifdef CONFIG_AUDITSYSCALL
        ld      r3,PACACURRENT(r13)
        ld      r4,AUDITCONTEXT(r3)
        cmpdi   0,r4,0