diff options
| author | Horms <horms@verge.net.au> | 2005-11-01 02:44:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 00:44:46 -0500 |
| commit | ebd50e500185a711e708653460d19f1dbb3ef944 (patch) | |
| tree | 6515d835c4883f9e26aff4c3a5105767de073e95 | |
| parent | faba278fb003dbe772f6c04526f1f096f43c995e (diff) | |
[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>
| -rw-r--r-- | arch/powerpc/kernel/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 984a10630714..2d22bf03484e 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -279,7 +279,7 @@ _GLOBAL(ppc32_rt_sigsuspend) | |||
| 279 | bne syscall_exit | 279 | bne syscall_exit |
| 280 | /* If sigsuspend() returns zero, we are going into a signal handler. We | 280 | /* If sigsuspend() returns zero, we are going into a signal handler. We |
| 281 | may need to call audit_syscall_exit() to mark the exit from sigsuspend() */ | 281 | may need to call audit_syscall_exit() to mark the exit from sigsuspend() */ |
| 282 | #ifdef CONFIG_AUDIT | 282 | #ifdef CONFIG_AUDITSYSCALL |
| 283 | ld r3,PACACURRENT(r13) | 283 | ld r3,PACACURRENT(r13) |
| 284 | ld r4,AUDITCONTEXT(r3) | 284 | ld r4,AUDITCONTEXT(r3) |
| 285 | cmpdi 0,r4,0 | 285 | cmpdi 0,r4,0 |