diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:20:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 06:20:44 -0400 |
| commit | 08229de4b42816079ed5d15f0689fcd0af946d5e (patch) | |
| tree | 7126dc7b220fbbce745cb5d9a8864e9690587da4 /security/security.c | |
| parent | fbb474dedab871c7382858c374acd287dad4ab38 (diff) | |
| parent | 2a708137fd7d3e0928f27157aaed8aba404b11c9 (diff) | |
Merge branch 'for-2.6.32' into mxc
Conflicts:
sound/soc/Makefile
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c index 5284255c5cdf..dc7674fbfc7a 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -26,9 +26,6 @@ extern void security_fixup_ops(struct security_operations *ops); | |||
| 26 | 26 | ||
| 27 | struct security_operations *security_ops; /* Initialized to NULL */ | 27 | struct security_operations *security_ops; /* Initialized to NULL */ |
| 28 | 28 | ||
| 29 | /* amount of vm to protect from userspace access */ | ||
| 30 | unsigned long mmap_min_addr = CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR; | ||
| 31 | |||
| 32 | static inline int verify(struct security_operations *ops) | 29 | static inline int verify(struct security_operations *ops) |
| 33 | { | 30 | { |
| 34 | /* verify the security_operations structure exists */ | 31 | /* verify the security_operations structure exists */ |