aboutsummaryrefslogtreecommitdiffstats
path: root/security/min_addr.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 16:58:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 16:58:26 -0800
commitefc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa (patch)
treecf7df8a837b719623e13b3ab19e8cfce1e270883 /security/min_addr.c
parentb5c96f89177b460ef89ecd777d5f2fefd4534d3f (diff)
parenta00ae4d21b2fa9379914f270ffffd8d3bec55430 (diff)
downloadmrst-s0i3-test-efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa.tar.gz
mrst-s0i3-test-efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa.tar.xz
mrst-s0i3-test-efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support NOMMU: Optimise away the {dac_,}mmap_min_addr tests security/min_addr.c: make init_mmap_min_addr() static keys: PTR_ERR return of wrong pointer in keyctl_get_security()
Diffstat (limited to 'security/min_addr.c')
-rw-r--r--security/min_addr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/min_addr.c b/security/min_addr.c
index fc43c9d3708..e86f297522b 100644
--- a/security/min_addr.c
+++ b/security/min_addr.c
@@ -43,7 +43,7 @@ int mmap_min_addr_handler(struct ctl_table *table, int write,
return ret;
}
-int __init init_mmap_min_addr(void)
+static int __init init_mmap_min_addr(void)
{
update_mmap_min_addr();