mmc: s3c6410: enable ADMA feature in 6410 sdhci controller

[safe/jmp/linux-2.6] / kernel / audit_watch.c

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index b49ab01..8df4369 100644 (file)
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -27,6 +27,7 @@
 #include <linux/namei.h>
 #include <linux/netlink.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/inotify.h>
 #include <linux/security.h>
 #include "audit.h"
@@ -45,8 +46,8 @@
 
 struct audit_watch {
        atomic_t                count;  /* reference count */
-       char                    *path;  /* insertion path */
        dev_t                   dev;    /* associated superblock device */
+       char                    *path;  /* insertion path */
        unsigned long           ino;    /* associated inode number */
        struct audit_parent     *parent; /* associated parent */
        struct list_head        wlist;  /* entry in parent->watches list */
@@ -234,11 +235,7 @@ static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watc
                audit_log_string(ab, op);
                audit_log_format(ab, " path=");
                audit_log_untrustedstring(ab, w->path);
-               if (r->filterkey) {
-                       audit_log_format(ab, " key=");
-                       audit_log_untrustedstring(ab, r->filterkey);
-               } else
-                       audit_log_format(ab, " key=(null)");
+               audit_log_key(ab, r->filterkey);
                audit_log_format(ab, " list=%d res=1", r->listnr);
                audit_log_end(ab);
        }