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

Commit e61aca51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig-diet' from Dave Hansen 

Merge Kconfig menu diet patches from Dave Hansen:
 "I think the "Kernel Hacking" menu has gotten a bit out of hand.  It is
  over 120 lines long on my system with everything enabled and options
  are scattered around it haphazardly.

        http://sr71.net/~dave/linux/kconfig-horror.png

  Let's try to introduce some sanity.  This set takes that 120 lines
  down to 55 and makes it vastly easier to find some things.  It's a
  start.

  This set stands on its own, but there is plenty of room for follow-up
  patches.  The arch-specific debug options still end up getting stuck
  in the top-level "kernel hacking" menu.  OPTIMIZE_INLINING, for
  instance, could obviously go in to the "compiler options" menu, but
  the fact that it is defined in arch/ in a separate Kconfig file keeps
  it on its own for the moment.

  The Signed-off-by's in here look funky.  I changed employers while
  working on this set, so I have signoffs from both email addresses"

* emailed patches from Dave Hansen <dave@sr71.net>:
  hang and lockup detection menu
  kconfig: consolidate printk options
  group locking debugging options
  consolidate compilation option configs
  consolidate runtime testing configs
  order memory debugging Kconfig options
  consolidate per-arch stack overflow debugging options
parents da67db4e 92aef8fb

arch/arc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ config ARC 
	select OF

	select OF_EARLY_FLATTREE

	select PERF_USE_VMALLOC

	select HAVE_DEBUG_STACKOVERFLOW



config SCHED_OMIT_FRAME_POINTER

	def_bool y

arch/arc/Kconfig.debug

+0 −7
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ config EARLY_PRINTK 
	  with klogd/syslogd or the X server. You should normally N here,

	  unless you want to debug such a crash.



config DEBUG_STACKOVERFLOW

	bool "Check for stack overflows"

	depends on DEBUG_KERNEL

	help

	  This option will cause messages to be printed if free stack space

	  drops below a certain limit.



config 16KSTACKS

	bool "Use 16Kb for kernel stacks instead of 8Kb"

	help

arch/blackfin/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ config BLACKFIN 
	select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS

	select HAVE_MOD_ARCH_SPECIFIC

	select MODULES_USE_ELF_RELA

	select HAVE_DEBUG_STACKOVERFLOW



config GENERIC_CSUM

	def_bool y

arch/blackfin/Kconfig.debug

+0 −7
Original line number Diff line number Diff line
@@ -2,13 +2,6 @@ menu "Kernel hacking" 


source "lib/Kconfig.debug"



config DEBUG_STACKOVERFLOW

	bool "Check for stack overflows"

	depends on DEBUG_KERNEL

	help

	  This option will cause messages to be printed if free stack space

	  drops below a certain limit.



config DEBUG_VERBOSE

	bool "Verbose fault messages"

	default y

arch/frv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config FRV 
	select ARCH_WANT_IPC_PARSE_VERSION

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION

	select HAVE_DEBUG_STACKOVERFLOW



config ZONE_DMA

	bool