CHROMIUM: Fix kref usage

BugLink: http://bugs.launchpad.net/bugs/887780

Also fixes some compile warnings.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/kernel/seccomp_filter.c b/kernel/seccomp_filter.c
index ac682cf..c551b9c 100644 (file)
--- a/kernel/seccomp_filter.c
+++ b/kernel/seccomp_filter.c
@@ -19,6 +19,7 @@
 
 #include <linux/capability.h>
 #include <linux/compat.h>
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/ftrace_event.h>
@@ -646,13 +647,12 @@ void put_seccomp_filters(struct seccomp_filters *orig)
 {
        if (!orig)
                return;
-       kref_put(orig, __put_seccomp_filters);
+       kref_put(&orig->usage, __put_seccomp_filters);
 }
 
 /* get_seccomp_filters - increments the reference count of @orig. */
 struct seccomp_filters *get_seccomp_filters(struct seccomp_filters *orig)
 {
-       int usage;
        if (!orig)
                return NULL;
        /* XXX: kref needs overflow prevention support. */