summaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-09-13 21:16:56 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-09-13 21:16:56 -0700
commitfc8e1ead9314cf0e0f1922e661428b93d3a50d88 (patch)
treef3cb97c4769b74f6627a59769f1ed5c92a13c58a /security/security.c
parent2bcaa6a4238094c5695d5b1943078388d82d3004 (diff)
parent9de48cc300fb10f7d9faa978670becf5e352462a (diff)
downloadkernel-crypto-fc8e1ead9314cf0e0f1922e661428b93d3a50d88.tar.gz
kernel-crypto-fc8e1ead9314cf0e0f1922e661428b93d3a50d88.tar.xz
kernel-crypto-fc8e1ead9314cf0e0f1922e661428b93d3a50d88.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c
index 5284255c5cd..dc7674fbfc7 100644
--- a/security/security.c
+++ b/security/security.c
@@ -26,9 +26,6 @@ extern void security_fixup_ops(struct security_operations *ops);
struct security_operations *security_ops; /* Initialized to NULL */
-/* amount of vm to protect from userspace access */
-unsigned long mmap_min_addr = CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR;
-
static inline int verify(struct security_operations *ops)
{
/* verify the security_operations structure exists */