summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-05-06 14:02:53 -0400
committerGreg Hackmann <ghackmann@google.com>2014-09-03 12:56:24 -0700
commit40ef955d6541361f2e22044a2362ee13f0fde89b (patch)
tree0599436d0621a5c2dbb27db4e62a8457a08db128 /security
parentf50be83d236b9b0169b85c47b8878f61bb22f448 (diff)
nick kvfree() from apparmor
too many places open-code it Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Conflicts: mm/util.c security/apparmor/include/apparmor.h Change-Id: Ie8602e0199282dc462921cb7217158d1998853b0
Diffstat (limited to 'security')
-rw-r--r--security/apparmor/include/apparmor.h1
-rw-r--r--security/apparmor/lib.c14
2 files changed, 0 insertions, 15 deletions
diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h
index 40aedd9f73e..4a8cbfeef8b 100644
--- a/security/apparmor/include/apparmor.h
+++ b/security/apparmor/include/apparmor.h
@@ -65,7 +65,6 @@ extern int apparmor_initialized __initdata;
char *aa_split_fqname(char *args, char **ns_name);
void aa_info_message(const char *str);
void *kvmalloc(size_t size);
-void kvfree(void *buffer);
/**
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index 5b62af7254c..ce8d9a84ab2 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -103,17 +103,3 @@ void *kvmalloc(size_t size)
}
return buffer;
}
-
-/**
- * kvfree - free an allocation do by kvmalloc
- * @buffer: buffer to free (MAYBE_NULL)
- *
- * Free a buffer allocated by kvmalloc
- */
-void kvfree(void *buffer)
-{
- if (is_vmalloc_addr(buffer))
- vfree(buffer);
- else
- kfree(buffer);
-}