git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "nfsd4: distinguish expired from stale stateids"
[safe/jmp/linux-2.6]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index
4f3ab47
..
4875142
100644
(file)
--- a/
security/capability.c
+++ b/
security/capability.c
@@
-421,7
+421,7
@@
static int cap_kernel_create_files_as(struct cred *new, struct inode *inode)
return 0;
}
return 0;
}
-static int cap_kernel_module_request(
void
)
+static int cap_kernel_module_request(
char *kmod_name
)
{
return 0;
}
{
return 0;
}
@@
-906,10
+906,6
@@
static void cap_audit_rule_free(void *lsmrule)
}
#endif /* CONFIG_AUDIT */
}
#endif /* CONFIG_AUDIT */
-struct security_operations default_security_ops = {
- .name = "default",
-};
-
#define set_to_cap_if_null(ops, function) \
do { \
if (!ops->function) { \
#define set_to_cap_if_null(ops, function) \
do { \
if (!ops->function) { \