projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index
d7ecf89
..
307211a
100644
(file)
--- a/
security/inode.c
+++ b/
security/inode.c
@@
-321,7
+321,7
@@
static int __init securityfs_init(void)
{
int retval;
- k
set
_set_kset_s(&security_subsys, kernel_subsys);
+ k
obj
_set_kset_s(&security_subsys, kernel_subsys);
retval = subsystem_register(&security_subsys);
if (retval)
return retval;