From: Chris Wright <chrisw@osdl.org>
To: akpm@osdl.org, torvalds@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 1/3] remove empty build of capability.o
Date: Tue, 11 May 2004 16:46:40 -0700 [thread overview]
Message-ID: <20040511164640.O21045@build.pdx.osdl.net> (raw)
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
next reply other threads:[~2004-05-11 23:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-11 23:46 Chris Wright [this message]
2004-05-11 23:50 ` [PATCH 2/3] minor cleanups in capability.c Chris Wright
2004-05-11 23:56 ` [PATCH 3/3] add disable param to capabilities module Chris Wright
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040511164640.O21045@build.pdx.osdl.net \
--to=chrisw@osdl.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®