diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-05-14 20:22:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 20:22:09 -0700 |
| commit | fc3a78892d9efc478cdb343e95f7ee4d9842d2c9 (patch) | |
| tree | 76c5744aae5949a8ef34cdd95aa806bae85b67c2 /security | |
| parent | cd8d1252e8d44b5c1776398c282eb2db9003efe5 (diff) | |
| download | history-fc3a78892d9efc478cdb343e95f7ee4d9842d2c9.tar.gz | |
[PATCH] security: remove empty build of capability.o
From: Chris Wright <chrisw@osdl.org>
The build includes capability.c when CONFIG_SECURITY=n, yet the whole file is
ifdef'd out. Remove unnecessary build step as well as superfluous ifdefs.
Diffstat (limited to 'security')
| -rw-r--r-- | security/Makefile | 2 | ||||
| -rw-r--r-- | security/capability.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/security/Makefile b/security/Makefile index d156d81adba732..3686a1bb324a71 100644 --- a/security/Makefile +++ b/security/Makefile @@ -6,7 +6,7 @@ subdir-$(CONFIG_SECURITY_SELINUX) += selinux # if we don't select a security model, use the default capabilities ifneq ($(CONFIG_SECURITY),y) -obj-y += commoncap.o capability.o +obj-y += commoncap.o endif # Object file lists diff --git a/security/capability.c b/security/capability.c index f1e81ba6b79d48..3920e7c993565e 100644 --- a/security/capability.c +++ b/security/capability.c @@ -23,9 +23,6 @@ #include <linux/netlink.h> #include <linux/ptrace.h> -#ifdef CONFIG_SECURITY - - static struct security_operations capability_ops = { .ptrace = cap_ptrace, .capget = cap_capget, @@ -99,5 +96,3 @@ module_exit (capability_exit); MODULE_DESCRIPTION("Standard Linux Capabilities Security Module"); MODULE_LICENSE("GPL"); - -#endif /* CONFIG_SECURITY */ |