diff options
| author | David Howells <dhowells@redhat.com> | 2009-12-15 19:27:45 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-06 15:04:30 -0800 |
| commit | 0399123f3dcce1a515d021107ec0fb4413ca3efa (patch) | |
| tree | feb6247bb86bcb4ccaf179d086ccd95fff6f2c66 /security | |
| parent | 1cfe005024b5c820f9b37c9045ec87ee75a8cfb6 (diff) | |
NOMMU: Optimise away the {dac_,}mmap_min_addr tests
commit 6e1415467614e854fee660ff6648bd10fa976e95 upstream.
In NOMMU mode clamp dac_mmap_min_addr to zero to cause the tests on it to be
skipped by the compiler. We do this as the minimum mmap address doesn't make
any sense in NOMMU mode.
mmap_min_addr and round_hint_to_min() can be discarded entirely in NOMMU mode.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security')
| -rw-r--r-- | security/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/Makefile b/security/Makefile index 95ecc06392d..510bbc80b9b 100644 --- a/security/Makefile +++ b/security/Makefile @@ -8,7 +8,8 @@ subdir-$(CONFIG_SECURITY_SMACK) += smack subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo # always enable default capabilities -obj-y += commoncap.o min_addr.o +obj-y += commoncap.o +obj-$(CONFIG_MMU) += min_addr.o # Object file lists obj-$(CONFIG_SECURITY) += security.o capability.o |