projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.15-rc6' into next/defconfig
[cascardo/linux.git]
/
security
/
apparmor
/
include
/
apparmor.h
diff --git
a/security/apparmor/include/apparmor.h
b/security/apparmor/include/apparmor.h
index
8fb1488
..
97130f8
100644
(file)
--- 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)
{