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

Commit 09cadedb authored by Mathieu Desnoyers's avatar Mathieu Desnoyers Committed by Linus Torvalds
Browse files

Combine instrumentation menus in kernel/Kconfig.instrumentation 



Quoting Randy:

"It seems sad that this patch sources Kconfig.marker, a 7-line file,
20-something times.  Yes, you (we) don't want to put those 7 lines into
20-something different files, so sourcing is the right thing.

However, what you did for avr32 seems more on the right track to me: make
_one_ Instrumentation support menu that includes PROFILING, OPROFILE, KPROBES,
and MARKERS and then use (source) that in all of the arches."

Signed-off-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1c3f0b8e

arch/alpha/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



source "arch/alpha/oprofile/Kconfig"

source "kernel/Kconfig.instrumentation"



source "arch/alpha/Kconfig.debug"

arch/alpha/oprofile/Kconfig

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 


menu "Profiling support"

	depends on EXPERIMENTAL



config PROFILING

	bool "Profiling support (EXPERIMENTAL)"

	help

	  Say Y here to enable the extended profiling support mechanisms used

	  by profilers such as OProfile.

	  



config OPROFILE

	tristate "OProfile system profiling (EXPERIMENTAL)"

	depends on PROFILING

	help

	  OProfile is a profiling system capable of profiling the

	  whole system, include the kernel, kernel modules, libraries,

	  and applications.



	  If unsure, say N.



endmenu

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ endmenu 


source "fs/Kconfig"



source "arch/arm/oprofile/Kconfig"

source "kernel/Kconfig.instrumentation"



source "arch/arm/Kconfig.debug"

arch/arm/oprofile/Kconfig

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 


menu "Profiling support"

	depends on EXPERIMENTAL



config PROFILING

	bool "Profiling support (EXPERIMENTAL)"

	help

	  Say Y here to enable the extended profiling support mechanisms used

	  by profilers such as OProfile.





config OPROFILE

	tristate "OProfile system profiling (EXPERIMENTAL)"

	depends on PROFILING

	help

	  OProfile is a profiling system capable of profiling the

	  whole system, include the kernel, kernel modules, libraries,

	  and applications.



	  If unsure, say N.



if OPROFILE



config OPROFILE_ARMV6

	bool

	depends on CPU_V6 && !SMP

	default y

	select OPROFILE_ARM11_CORE



config OPROFILE_MPCORE

	bool

	depends on CPU_V6 && SMP

	default y

	select OPROFILE_ARM11_CORE



config OPROFILE_ARM11_CORE

	bool



endif



endmenu

arch/blackfin/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



source "arch/blackfin/oprofile/Kconfig"

source "kernel/Kconfig.instrumentation"



menu "Kernel hacking"