Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6ea43d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 126d4576 62b4d204

init/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -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