Merge branch 'akpm-current/current'

[karo-tx-linux.git] / kernel / auditsc.c

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 195ffaee50b984c690409023db023e1301144771..51d76ba1db35bd0ed192ea1a4cd15bf6249e574e 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1025,7 +1025,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
         * any.
         */
        if (WARN_ON_ONCE(len < 0 || len > MAX_ARG_STRLEN - 1)) {
-               send_sig(SIGKILL, current, 0);
+               io_send_sig(SIGKILL);
                return -1;
        }
 
@@ -1043,7 +1043,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
                 */
                if (ret) {
                        WARN_ON(1);
-                       send_sig(SIGKILL, current, 0);
+                       io_send_sig(SIGKILL);
                        return -1;
                }
                buf[to_send] = '\0';
@@ -1107,7 +1107,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
                        ret = 0;
                if (ret) {
                        WARN_ON(1);
-                       send_sig(SIGKILL, current, 0);
+                       io_send_sig(SIGKILL);
                        return -1;
                }
                buf[to_send] = '\0';
@@ -2412,8 +2412,8 @@ void __audit_seccomp(unsigned long syscall, long signr, int code)
                return;
        audit_log_task(ab);
        audit_log_format(ab, " sig=%ld arch=%x syscall=%ld compat=%d ip=0x%lx code=0x%x",
-                        signr, syscall_get_arch(), syscall, is_compat_task(),
-                        KSTK_EIP(current), code);
+                        signr, syscall_get_arch(), syscall,
+                        in_compat_syscall(), KSTK_EIP(current), code);
        audit_log_end(ab);
 }