diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 14:02:53 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 14:02:53 -0400 |
commit | 39f1f78d53b9bcbca91967380c5f0f2305a5c55f (patch) | |
tree | 83020c0da45781d7b205193dd7327952133f2194 /security/apparmor | |
parent | 50c6e282bdf5e8dabf8d7cf7b162545a55645fd9 (diff) |
nick kvfree() from apparmor
too many places open-code it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/apparmor')
-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; | |||
66 | char *aa_split_fqname(char *args, char **ns_name); | 66 | char *aa_split_fqname(char *args, char **ns_name); |
67 | void aa_info_message(const char *str); | 67 | void aa_info_message(const char *str); |
68 | void *__aa_kvmalloc(size_t size, gfp_t flags); | 68 | void *__aa_kvmalloc(size_t size, gfp_t flags); |
69 | void kvfree(void *buffer); | ||
70 | 69 | ||
71 | static inline void *kvmalloc(size_t size) | 70 | static inline void *kvmalloc(size_t size) |
72 | { | 71 | { |
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) | |||
104 | } | 104 | } |
105 | return buffer; | 105 | return buffer; |
106 | } | 106 | } |
107 | |||
108 | /** | ||
109 | * kvfree - free an allocation do by kvmalloc | ||
110 | * @buffer: buffer to free (MAYBE_NULL) | ||
111 | * | ||
112 | * Free a buffer allocated by kvmalloc | ||
113 | */ | ||
114 | void kvfree(void *buffer) | ||
115 | { | ||
116 | if (is_vmalloc_addr(buffer)) | ||
117 | vfree(buffer); | ||
118 | else | ||
119 | kfree(buffer); | ||
120 | } | ||