Fix build failure on ppc64 without CONFIG_AUDIT
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 6 Sep 2005 07:09:03 +0000 (08:09 +0100)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 6 Sep 2005 07:09:03 +0000 (08:09 +0100)
We shouldn't call audit_syscall_exit() unless it actually exists.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
arch/ppc64/kernel/entry.S

index ae5d563ad93a8bff1b4fdbaa9c91b579128dbb00..14cd56ac40dd706d15f3cdd6f6ea922ca15490a6 100644 (file)
@@ -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() */
        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
        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
        li      r4, 2                   /* AUDITSC_FAILURE */
        li      r5,-4                   /* It's always -EINTR */
        bl      .audit_syscall_exit
+#endif
        b       .ret_from_except
 
 _GLOBAL(ppc_fork)
        b       .ret_from_except
 
 _GLOBAL(ppc_fork)