From: Horms Date: Tue, 1 Nov 2005 07:44:29 +0000 (-0800) Subject: [PATCH] audit_sysctl_exit can only be used with CONF_AUDIT_SYSCTL X-Git-Tag: v2.6.15-rc1~18^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebd50e500185a711e708653460d19f1dbb3ef944;p=platform%2Fkernel%2Flinux-3.10.git [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 Acked-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 984a106..2d22bf0 100644 --- 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