summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-04 09:32:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-04 09:32:47 -0700
commit7b6ea43d3f90ba1db87883126c2c09777f51d3d6 (patch)
tree588ae7d8722b5ba31337b72c3dd5d9a9b3143e0d
parent126d4576cb73c8a440adc37c129589cd66051bcc (diff)
parent62b4d2041117f35ab2409c9f5c4b8d3dc8e59d0f (diff)
downloadlinux-stable-7b6ea43d3f90ba1db87883126c2c09777f51d3d6.tar.gz
linux-stable-7b6ea43d3f90ba1db87883126c2c09777f51d3d6.tar.bz2
linux-stable-7b6ea43d3f90ba1db87883126c2c09777f51d3d6.zip
Merge tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/josh/linux
Pull kconfig fixes for tiny setups from Josh Triplett: "Two Kconfig bugfixes for 3.17 related to tinification. These fixes make the Kconfig "General Setup" menu much more usable" * tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/josh/linux: init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu init/Kconfig: Hide printk log config if CONFIG_PRINTK=n
-rw-r--r--init/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index e84c6423a2e5..80a6907f91c5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -811,6 +811,7 @@ config LOG_BUF_SHIFT
int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
range 12 21
default 17
+ depends on PRINTK
help
Select the minimal kernel log buffer size as a power of 2.
The final size is affected by LOG_CPU_MAX_BUF_SHIFT config
@@ -830,6 +831,7 @@ config LOG_CPU_MAX_BUF_SHIFT
range 0 21
default 12 if !BASE_SMALL
default 0 if BASE_SMALL
+ depends on PRINTK
help
This option allows to increase the default ring buffer size
according to the number of CPUs. The value defines the contribution
@@ -1475,6 +1477,7 @@ config FUTEX
config HAVE_FUTEX_CMPXCHG
bool
+ depends on FUTEX
help
Architectures should select this if futex_atomic_cmpxchg_inatomic()
is implemented and always working. This removes a couple of runtime