diff options
| author | Linus Torvalds | 2009-12-18 01:58:26 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-12-18 01:58:26 +0100 |
| commit | efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa (patch) | |
| tree | cf7df8a837b719623e13b3ab19e8cfce1e270883 /security/Makefile | |
| parent | Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support (diff) | |
| download | kernel-qcow2-linux-efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa.tar.gz kernel-qcow2-linux-efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa.tar.xz kernel-qcow2-linux-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/Makefile')
| -rw-r--r-- | security/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/Makefile b/security/Makefile index bb44e350c618..da20a193c8dd 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 |