diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 14:02:53 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-27 19:59:54 +0200 |
| commit | fb6a2a8ebe2741cd15d9f4c613c6b40cf0e40ea5 (patch) | |
| tree | 6a12ea3bc00a1298785a998b07b060c846512196 /security | |
| parent | 75f208f5585ea8ccd430521355eb7bc6f7775a73 (diff) | |
| download | lwn-fb6a2a8ebe2741cd15d9f4c613c6b40cf0e40ea5.tar.gz lwn-fb6a2a8ebe2741cd15d9f4c613c6b40cf0e40ea5.zip | |
nick kvfree() from apparmor
commit 39f1f78d53b9bcbca91967380c5f0f2305a5c55f upstream.
too many places open-code it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/include/apparmor.h | 1 | ||||
| -rw-r--r-- | security/apparmor/lib.c | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h index 8fb1488a3cd4..97130f88838b 100644 --- a/security/apparmor/include/apparmor.h +++ b/security/apparmor/include/apparmor.h @@ -66,7 +66,6 @@ extern int apparmor_initialized __initdata; char *aa_split_fqname(char *args, char **ns_name); void aa_info_message(const char *str); void *__aa_kvmalloc(size_t size, gfp_t flags); -void kvfree(void *buffer); static inline void *kvmalloc(size_t size) { diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c index 69689922c491..c1827e068454 100644 --- a/security/apparmor/lib.c +++ b/security/apparmor/lib.c @@ -104,17 +104,3 @@ void *__aa_kvmalloc(size_t size, gfp_t flags) } 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); -} |