Skip to content

Commit

Permalink
Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
Browse files Browse the repository at this point in the history 
Move the instrumentation Kconfig to

arch/Kconfig for architecture dependent options
  - oprofile
  - kprobes

and

init/Kconfig for architecture independent options
  - profiling
  - markers

Remove the "Instrumentation Support" menu. Everything moves to "General setup".
Delete the kernel/Kconfig.instrumentation file.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
@sravnborg
Mathieu Desnoyers authored and sravnborg committed Feb 3, 2008
1 parent 3f55009 commit 125e564
Show file tree
Hide file tree
Showing 25 changed files with 40 additions and 99 deletions.
28 changes: 28 additions & 0 deletions arch/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
#
# General architecture dependent options
#

config OPROFILE
tristate "OProfile system profiling (EXPERIMENTAL)"
depends on PROFILING
depends on HAVE_OPROFILE
help
OProfile is a profiling system capable of profiling the
whole system, include the kernel, kernel modules, libraries,
and applications.

If unsure, say N.

config HAVE_OPROFILE
def_bool n

config KPROBES
bool "Kprobes"
depends on KALLSYMS && MODULES
depends on HAVE_KPROBES
help
Kprobes allows you to trap at almost any kernel address and
execute a callback function. register_kprobe() establishes
a probepoint and specifies the callback. Kprobes is useful
for kernel debugging, non-intrusive instrumentation and testing.
If in doubt, say "N".

config HAVE_KPROBES
def_bool n
2 changes: 0 additions & 2 deletions arch/alpha/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/alpha/Kconfig.debug"

# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1147,8 +1147,6 @@ endmenu

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/arm/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/blackfin/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,8 +974,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/blackfin/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/cris/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ source "drivers/pci/Kconfig"

source "drivers/usb/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/cris/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/frv/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/frv/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/h8300/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,6 @@ endmenu

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/h8300/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/ia64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,6 @@ config IRQ_PER_CPU

source "arch/ia64/hp/sim/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/ia64/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/m32r/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/m32r/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/m68k/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,6 @@ endmenu

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/m68k/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/m68knommu/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/m68knommu/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/mips/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2096,8 +2096,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/mips/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/parisc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/parisc/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/powerpc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,8 +715,6 @@ source "arch/powerpc/sysdev/qe_lib/Kconfig"

source "lib/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/powerpc/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/ppc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1258,8 +1258,6 @@ endmenu

source "lib/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/ppc/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/s390/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/s390/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/sh/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,8 +897,6 @@ source "drivers/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/sh/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/sparc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,6 @@ endmenu

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/sparc/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/sparc64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,6 @@ source "drivers/sbus/char/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/sparc64/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/um/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,4 @@ config INPUT
bool
default n

source "kernel/Kconfig.instrumentation"

source "arch/um/Kconfig.debug"
2 changes: 0 additions & 2 deletions arch/v850/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,6 @@ source "sound/Kconfig"

source "drivers/usb/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/v850/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/x86/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1595,8 +1595,6 @@ source "drivers/firmware/Kconfig"

source "fs/Kconfig"

source "kernel/Kconfig.instrumentation"

source "arch/x86/Kconfig.debug"

source "security/Kconfig"
Expand Down
2 changes: 0 additions & 2 deletions arch/xtensa/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,6 @@ config EMBEDDED_RAMDISK_IMAGE
provide one yourself.
endmenu

source "kernel/Kconfig.instrumentation"

source "arch/xtensa/Kconfig.debug"

source "security/Kconfig"
Expand Down
12 changes: 12 additions & 0 deletions init/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,18 @@ config SLOB

endchoice

config PROFILING
bool "Profiling support (EXPERIMENTAL)"
help
Say Y here to enable the extended profiling support mechanisms used
by profilers such as OProfile.

config MARKERS
bool "Activate markers"
help
Place an empty function call at each marker site. Can be
dynamically changed for a probe function.

source "arch/Kconfig"

endmenu # General setup
Expand Down
55 changes: 0 additions & 55 deletions kernel/Kconfig.instrumentation
View file

This file was deleted.

0 comments on commit 125e564

Please sign in to comment.