Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index a6c632757e57a3223c8daebf1219d8d94c218120..74f8647fef26aafd8af4a4c2ddf6c8212948c72b 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -372,8 +372,9 @@ static void audit_printk_skb(struct sk_buff *skb)
        char *data = nlmsg_data(nlh);
 
        if (nlh->nlmsg_type != AUDIT_EOE) {
-               if (printk_ratelimit())
+               if (printk_ratelimit()){
                        printk(KERN_NOTICE "type=%d %s\n", nlh->nlmsg_type, data);
+               }               
                else
                        audit_log_lost("printk limit exceeded\n");
        }
@@ -1412,7 +1413,7 @@ void audit_log_cap(struct audit_buffer *ab, char *prefix, kernel_cap_t *cap)
        audit_log_format(ab, " %s=", prefix);
        CAP_FOR_EACH_U32(i) {
                audit_log_format(ab, "%08x",
-                                cap->cap[(_KERNEL_CAPABILITY_U32S-1) - i]);
+                                cap->cap[CAP_LAST_U32 - i]);
        }
 }