[PATCH 1/3] remove empty build of capability.o

From: Chris Wright
Date: Tue May 11 2004 - 18:52:16 EST


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.

--- linus-2.5/security/capability.c~ifdef 2004-05-11 14:55:19.000000000 -0700
+++ linus-2.5/security/capability.c 2004-05-11 15:00:28.000000000 -0700
@@ -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_DESCRIPTION("Standard Linux Capabilities Security Module");
MODULE_LICENSE("GPL");
-
-#endif /* CONFIG_SECURITY */
--- linus-2.5/security/Makefile~ifdef 2004-05-11 14:58:06.000000000 -0700
+++ linus-2.5/security/Makefile 2004-05-11 14:58:16.000000000 -0700
@@ -6,7 +6,7 @@

# 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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/