lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'tiny/kconfig-for-3.17' of https://git.kernel.org/pub/scm/linux/kernel/git/josh/linux

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-10-04 09:32:47 -07:00
parent 126d4576cb 62b4d20411
commit 7b6ea43d3f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
init/Kconfig
View File

@@ -811,6 +811,7 @@ config LOG_BUF_SHIFT
int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
range 12 21 range 12 21
default 17 default 17
depends on PRINTK
help help
Select the minimal kernel log buffer size as a power of 2. Select the minimal kernel log buffer size as a power of 2.
The final size is affected by LOG_CPU_MAX_BUF_SHIFT config 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 range 0 21
default 12 if !BASE_SMALL default 12 if !BASE_SMALL
default 0 if BASE_SMALL default 0 if BASE_SMALL
depends on PRINTK
help help
This option allows to increase the default ring buffer size This option allows to increase the default ring buffer size
according to the number of CPUs. The value defines the contribution according to the number of CPUs. The value defines the contribution
@@ -1475,6 +1477,7 @@ config FUTEX
config HAVE_FUTEX_CMPXCHG config HAVE_FUTEX_CMPXCHG
bool bool
depends on FUTEX
help help
Architectures should select this if futex_atomic_cmpxchg_inatomic() Architectures should select this if futex_atomic_cmpxchg_inatomic()
is implemented and always working. This removes a couple of runtime is implemented and always working. This removes a couple of runtime