diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /lib/Kconfig.debug | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'lib/Kconfig.debug')
| -rw-r--r-- | lib/Kconfig.debug | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 234ceb10861f..0b8f35918a36 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -750,7 +750,7 @@ config RCU_TORTURE_TEST_RUNNABLE | |||
| 750 | config RCU_CPU_STALL_DETECTOR | 750 | config RCU_CPU_STALL_DETECTOR |
| 751 | bool "Check for stalled CPUs delaying RCU grace periods" | 751 | bool "Check for stalled CPUs delaying RCU grace periods" |
| 752 | depends on TREE_RCU || TREE_PREEMPT_RCU | 752 | depends on TREE_RCU || TREE_PREEMPT_RCU |
| 753 | default n | 753 | default y |
| 754 | help | 754 | help |
| 755 | This option causes RCU to printk information on which | 755 | This option causes RCU to printk information on which |
| 756 | CPUs are delaying the current grace period, but only when | 756 | CPUs are delaying the current grace period, but only when |
| @@ -912,7 +912,7 @@ config LATENCYTOP | |||
| 912 | 912 | ||
| 913 | config SYSCTL_SYSCALL_CHECK | 913 | config SYSCTL_SYSCALL_CHECK |
| 914 | bool "Sysctl checks" | 914 | bool "Sysctl checks" |
| 915 | depends on SYSCTL_SYSCALL | 915 | depends on SYSCTL |
| 916 | ---help--- | 916 | ---help--- |
| 917 | sys_sysctl uses binary paths that have been found challenging | 917 | sys_sysctl uses binary paths that have been found challenging |
| 918 | to properly maintain and use. This enables checks that help | 918 | to properly maintain and use. This enables checks that help |