Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index 51ef509710b9d50bc7aa65d89cbf7bde359a6126..27e5863d30f1f916393e855a6bfa496475a8fa71 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -12,11 +12,9 @@
  */
 
 #include <linux/capability.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/security.h>
 
 #define SECURITY_FRAMEWORK_VERSION     "1.0.0"
@@ -26,6 +24,7 @@ extern struct security_operations dummy_security_ops;
 extern void security_fixup_ops(struct security_operations *ops);
 
 struct security_operations *security_ops;      /* Initialized to NULL */
+unsigned long mmap_min_addr;           /* 0 means no protection */
 
 static inline int verify(struct security_operations *ops)
 {