diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-01-21 00:12:21 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-01-21 00:12:21 -0500 |
commit | f49028292c13b958fdf4f36c8cc8119d0dde187b (patch) | |
tree | ea1f92969a8aca7083f19c4ef07dd3674509554f /security | |
parent | eef8f4c2acac6fae84f2d959a145fa3cad4d00c9 (diff) | |
parent | 78e691f4ae2d5edea0199ca802bb505b9cdced88 (diff) |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Documentation updates.
- Miscellaneous fixes.
- Preemptible-RCU fixes, including fixing an old bug in the
interaction of RCU priority boosting and CPU hotplug.
- SRCU updates.
- RCU CPU stall-warning updates.
- RCU torture-test updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/tomoyo/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/tomoyo/Kconfig b/security/tomoyo/Kconfig index 8eb779b9d77f..604e718d68d3 100644 --- a/security/tomoyo/Kconfig +++ b/security/tomoyo/Kconfig | |||
@@ -5,6 +5,7 @@ config SECURITY_TOMOYO | |||
5 | select SECURITYFS | 5 | select SECURITYFS |
6 | select SECURITY_PATH | 6 | select SECURITY_PATH |
7 | select SECURITY_NETWORK | 7 | select SECURITY_NETWORK |
8 | select SRCU | ||
8 | default n | 9 | default n |
9 | help | 10 | help |
10 | This selects TOMOYO Linux, pathname-based access control. | 11 | This selects TOMOYO Linux, pathname-based access control. |