diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 19:58:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 19:58:26 -0500 |
| commit | efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa (patch) | |
| tree | cf7df8a837b719623e13b3ab19e8cfce1e270883 /security/Makefile | |
| parent | b5c96f89177b460ef89ecd777d5f2fefd4534d3f (diff) | |
| parent | a00ae4d21b2fa9379914f270ffffd8d3bec55430 (diff) | |
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 | |||
| 8 | subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo | 8 | subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo |
| 9 | 9 | ||
| 10 | # always enable default capabilities | 10 | # always enable default capabilities |
| 11 | obj-y += commoncap.o min_addr.o | 11 | obj-y += commoncap.o |
| 12 | obj-$(CONFIG_MMU) += min_addr.o | ||
| 12 | 13 | ||
| 13 | # Object file lists | 14 | # Object file lists |
| 14 | obj-$(CONFIG_SECURITY) += security.o capability.o | 15 | obj-$(CONFIG_SECURITY) += security.o capability.o |