Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block

[mirror_ubuntu-zesty-kernel.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index 32fa03ad1984da1395386d99deee3b98e073648d..0a813d2883e58089563bd0d266a99e5c029ece3b 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -42,8 +42,8 @@
  */
 
 #include <linux/init.h>
-#include <asm/atomic.h>
 #include <asm/types.h>
+#include <asm/atomic.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/err.h>
@@ -267,7 +267,7 @@ static int audit_set_failure(int state, uid_t loginuid)
        return old;
 }
 
-int kauditd_thread(void *dummy)
+static int kauditd_thread(void *dummy)
 {
        struct sk_buff *skb;