Re: [patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-12-11 Thread Andrew Morton
On Sat, 08 Dec 2007 10:32:59 -0500 Mathieu Desnoyers <[EMAIL PROTECTED]> wrote:

> +config OPROFILE
> + tristate "OProfile system profiling (EXPERIMENTAL)"
> + depends on PROFILING && !UML
> + depends on HAVE_OPROFILE

And I removed the !UML here.  UML shouldn't be setting HAVE_OPROFILE.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-12-11 Thread Andrew Morton
On Sat, 08 Dec 2007 10:32:59 -0500 Mathieu Desnoyers [EMAIL PROTECTED] wrote:

 +config OPROFILE
 + tristate OProfile system profiling (EXPERIMENTAL)
 + depends on PROFILING  !UML
 + depends on HAVE_OPROFILE

And I removed the !UML here.  UML shouldn't be setting HAVE_OPROFILE.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-12-08 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 25 files changed, 40 insertions(+), 99 deletions(-)

Index: linux-2.6-lttng.mm/arch/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/Kconfig2007-12-08 09:57:15.0 
-0500
+++ linux-2.6-lttng.mm/arch/Kconfig 2007-12-08 10:10:53.0 -0500
@@ -1,3 +1,31 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate "OProfile system profiling (EXPERIMENTAL)"
+   depends on PROFILING && !UML
+   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
Index: linux-2.6-lttng.mm/init/Kconfig
===
--- linux-2.6-lttng.mm.orig/init/Kconfig2007-12-08 09:57:15.0 
-0500
+++ linux-2.6-lttng.mm/init/Kconfig 2007-12-08 10:08:17.0 -0500
@@ -701,6 +701,18 @@ config PROC_PAGE_MONITOR
  /proc/kpagecount, and /proc/kpageflags. Disabling these
   interfaces will reduce the size of the kernel by approximately 4kb.
 
+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
Index: linux-2.6-lttng.mm/arch/alpha/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/alpha/Kconfig  2007-12-08 09:57:56.0 
-0500
+++ linux-2.6-lttng.mm/arch/alpha/Kconfig   2007-12-08 10:08:17.0 
-0500
@@ -658,8 +658,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
Index: linux-2.6-lttng.mm/arch/arm/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/arm/Kconfig2007-12-08 09:57:56.0 
-0500
+++ linux-2.6-lttng.mm/arch/arm/Kconfig 2007-12-08 10:08:17.0 -0500
@@ -1077,8 +1077,6 @@ endmenu
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"
Index: linux-2.6-lttng.mm/arch/blackfin/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/blackfin/Kconfig   2007-12-08 
09:57:56.0 -0500
+++ linux-2.6-lttng.mm/arch/blackfin/Kconfig2007-12-08 10:08:17.0 
-0500
@@ -995,8 +995,6 @@ source "drivers/Kconfig"
 
 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-12-08 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 25 files changed, 40 insertions(+), 99 deletions(-)

Index: linux-2.6-lttng.mm/arch/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/Kconfig2007-12-08 09:57:15.0 
-0500
+++ linux-2.6-lttng.mm/arch/Kconfig 2007-12-08 10:10:53.0 -0500
@@ -1,3 +1,31 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate OProfile system profiling (EXPERIMENTAL)
+   depends on PROFILING  !UML
+   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
Index: linux-2.6-lttng.mm/init/Kconfig
===
--- linux-2.6-lttng.mm.orig/init/Kconfig2007-12-08 09:57:15.0 
-0500
+++ linux-2.6-lttng.mm/init/Kconfig 2007-12-08 10:08:17.0 -0500
@@ -701,6 +701,18 @@ config PROC_PAGE_MONITOR
  /proc/kpagecount, and /proc/kpageflags. Disabling these
   interfaces will reduce the size of the kernel by approximately 4kb.
 
+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
Index: linux-2.6-lttng.mm/arch/alpha/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/alpha/Kconfig  2007-12-08 09:57:56.0 
-0500
+++ linux-2.6-lttng.mm/arch/alpha/Kconfig   2007-12-08 10:08:17.0 
-0500
@@ -658,8 +658,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
Index: linux-2.6-lttng.mm/arch/arm/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/arm/Kconfig2007-12-08 09:57:56.0 
-0500
+++ linux-2.6-lttng.mm/arch/arm/Kconfig 2007-12-08 10:08:17.0 -0500
@@ -1077,8 +1077,6 @@ endmenu
 
 source fs/Kconfig
 
-source kernel/Kconfig.instrumentation
-
 source arch/arm/Kconfig.debug
 
 source security/Kconfig
Index: linux-2.6-lttng.mm/arch/blackfin/Kconfig
===
--- linux-2.6-lttng.mm.orig/arch/blackfin/Kconfig   2007-12-08 
09:57:56.0 -0500
+++ linux-2.6-lttng.mm/arch/blackfin/Kconfig2007-12-08 10:08:17.0 
-0500
@@ -995,8 +995,6 @@ source drivers/Kconfig
 
 source fs/Kconfig
 
-source 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-12-04 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 26 files changed, 40 insertions(+), 101 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-12-04 12:42:02.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-12-04 12:42:03.0 -0500
@@ -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
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-12-04 12:42:02.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-12-04 12:42:03.0 -0500
@@ -656,6 +656,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
Index: linux-2.6-lttng/arch/alpha/Kconfig
===
--- linux-2.6-lttng.orig/arch/alpha/Kconfig 2007-12-04 12:42:02.0 
-0500
+++ linux-2.6-lttng/arch/alpha/Kconfig  2007-12-04 12:42:03.0 -0500
@@ -655,8 +655,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
Index: linux-2.6-lttng/arch/arm/Kconfig
===
--- linux-2.6-lttng.orig/arch/arm/Kconfig   2007-12-04 12:42:02.0 
-0500
+++ linux-2.6-lttng/arch/arm/Kconfig2007-12-04 12:42:03.0 -0500
@@ -1071,8 +1071,6 @@ endmenu
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"
Index: linux-2.6-lttng/arch/blackfin/Kconfig
===
--- linux-2.6-lttng.orig/arch/blackfin/Kconfig  2007-12-04 12:42:02.0 
-0500
+++ linux-2.6-lttng/arch/blackfin/Kconfig   2007-12-04 12:42:03.0 
-0500
@@ -995,8 +995,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/blackfin/Kconfig.debug"
 
 source "security/Kconfig"
Index: 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-12-04 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 26 files changed, 40 insertions(+), 101 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-12-04 12:42:02.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-12-04 12:42:03.0 -0500
@@ -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
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-12-04 12:42:02.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-12-04 12:42:03.0 -0500
@@ -656,6 +656,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
Index: linux-2.6-lttng/arch/alpha/Kconfig
===
--- linux-2.6-lttng.orig/arch/alpha/Kconfig 2007-12-04 12:42:02.0 
-0500
+++ linux-2.6-lttng/arch/alpha/Kconfig  2007-12-04 12:42:03.0 -0500
@@ -655,8 +655,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
Index: linux-2.6-lttng/arch/arm/Kconfig
===
--- linux-2.6-lttng.orig/arch/arm/Kconfig   2007-12-04 12:42:02.0 
-0500
+++ linux-2.6-lttng/arch/arm/Kconfig2007-12-04 12:42:03.0 -0500
@@ -1071,8 +1071,6 @@ endmenu
 
 source fs/Kconfig
 
-source kernel/Kconfig.instrumentation
-
 source arch/arm/Kconfig.debug
 
 source security/Kconfig
Index: linux-2.6-lttng/arch/blackfin/Kconfig
===
--- linux-2.6-lttng.orig/arch/blackfin/Kconfig  2007-12-04 12:42:02.0 
-0500
+++ linux-2.6-lttng/arch/blackfin/Kconfig   2007-12-04 12:42:03.0 
-0500
@@ -995,8 +995,6 @@ source drivers/Kconfig
 
 source fs/Kconfig
 
-source kernel/Kconfig.instrumentation
-
 source arch/blackfin/Kconfig.debug
 
 source security/Kconfig
Index: linux-2.6-lttng/arch/cris/Kconfig

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-15 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 26 files changed, 40 insertions(+), 101 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-15 22:11:34.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-15 22:16:09.0 -0500
@@ -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
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-15 22:11:34.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-15 22:15:27.0 -0500
@@ -649,6 +649,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
Index: linux-2.6-lttng/arch/alpha/Kconfig
===
--- linux-2.6-lttng.orig/arch/alpha/Kconfig 2007-11-15 22:15:16.0 
-0500
+++ linux-2.6-lttng/arch/alpha/Kconfig  2007-11-15 22:15:27.0 -0500
@@ -655,8 +655,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
Index: linux-2.6-lttng/arch/arm/Kconfig
===
--- linux-2.6-lttng.orig/arch/arm/Kconfig   2007-11-15 22:15:16.0 
-0500
+++ linux-2.6-lttng/arch/arm/Kconfig2007-11-15 22:15:27.0 -0500
@@ -1071,8 +1071,6 @@ endmenu
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/arm/Kconfig.debug"
 
 source "security/Kconfig"
Index: linux-2.6-lttng/arch/blackfin/Kconfig
===
--- linux-2.6-lttng.orig/arch/blackfin/Kconfig  2007-11-15 22:15:16.0 
-0500
+++ linux-2.6-lttng/arch/blackfin/Kconfig   2007-11-15 22:15:27.0 
-0500
@@ -1074,8 +1074,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
Index: linux-2.6-lttng/arch/cris/Kconfig

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-15 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 26 files changed, 40 insertions(+), 101 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-15 21:33:42.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-15 21:35:04.0 -0500
@@ -1,3 +1,31 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate "OProfile system profiling (EXPERIMENTAL)"
+   depends on PROFILING
+   depends on ARCH_HAS_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 ARCH_HAS_OPROFILE
+   def_bool n
+
+config KPROBES
+   bool "Kprobes"
+   depends on KALLSYMS && MODULES
+   depends on ARCH_HAS_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 ARCH_HAS_KPROBES
+   def_bool n
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-15 21:33:43.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-15 21:35:04.0 -0500
@@ -649,6 +649,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
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-15 
21:33:43.0 -0500
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,55 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool "Instrumentation Support"
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_HAS_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 ARCH_HAS_OPROFILE
-   def_bool n
-
-config KPROBES

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-15 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 27 files changed, 40 insertions(+), 103 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-14 17:03:04.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-14 17:12:57.0 -0500
@@ -1,3 +1,31 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate "OProfile system profiling (EXPERIMENTAL)"
+   depends on PROFILING
+   depends on ARCH_HAS_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 ARCH_HAS_OPROFILE
+   def_bool n
+
+config KPROBES
+   bool "Kprobes"
+   depends on KALLSYMS && MODULES
+   depends on ARCH_HAS_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 ARCH_HAS_KPROBES
+   def_bool n
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-14 17:03:04.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-14 17:12:57.0 -0500
@@ -644,6 +644,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
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-14 
17:12:56.0 -0500
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,55 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool "Instrumentation Support"
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_HAS_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 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-15 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 27 files changed, 40 insertions(+), 103 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-14 17:03:04.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-14 17:12:57.0 -0500
@@ -1,3 +1,31 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate OProfile system profiling (EXPERIMENTAL)
+   depends on PROFILING
+   depends on ARCH_HAS_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 ARCH_HAS_OPROFILE
+   def_bool n
+
+config KPROBES
+   bool Kprobes
+   depends on KALLSYMS  MODULES
+   depends on ARCH_HAS_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 ARCH_HAS_KPROBES
+   def_bool n
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-14 17:03:04.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-14 17:12:57.0 -0500
@@ -644,6 +644,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
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-14 
17:12:56.0 -0500
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,55 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool Instrumentation Support
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_HAS_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 ARCH_HAS_OPROFILE
-   def_bool n
-

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-15 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 26 files changed, 40 insertions(+), 101 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-15 21:33:42.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-15 21:35:04.0 -0500
@@ -1,3 +1,31 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate OProfile system profiling (EXPERIMENTAL)
+   depends on PROFILING
+   depends on ARCH_HAS_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 ARCH_HAS_OPROFILE
+   def_bool n
+
+config KPROBES
+   bool Kprobes
+   depends on KALLSYMS  MODULES
+   depends on ARCH_HAS_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 ARCH_HAS_KPROBES
+   def_bool n
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-15 21:33:43.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-15 21:35:04.0 -0500
@@ -649,6 +649,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
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-15 
21:33:43.0 -0500
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,55 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool Instrumentation Support
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_HAS_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 ARCH_HAS_OPROFILE
-   def_bool n
-
-config KPROBES
-   bool Kprobes
-   

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-15 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   28 
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig   |2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 
 kernel/Kconfig.instrumentation |   55 -
 26 files changed, 40 insertions(+), 101 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-15 22:11:34.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-15 22:16:09.0 -0500
@@ -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
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-15 22:11:34.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-15 22:15:27.0 -0500
@@ -649,6 +649,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
Index: linux-2.6-lttng/arch/alpha/Kconfig
===
--- linux-2.6-lttng.orig/arch/alpha/Kconfig 2007-11-15 22:15:16.0 
-0500
+++ linux-2.6-lttng/arch/alpha/Kconfig  2007-11-15 22:15:27.0 -0500
@@ -655,8 +655,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
Index: linux-2.6-lttng/arch/arm/Kconfig
===
--- linux-2.6-lttng.orig/arch/arm/Kconfig   2007-11-15 22:15:16.0 
-0500
+++ linux-2.6-lttng/arch/arm/Kconfig2007-11-15 22:15:27.0 -0500
@@ -1071,8 +1071,6 @@ endmenu
 
 source fs/Kconfig
 
-source kernel/Kconfig.instrumentation
-
 source arch/arm/Kconfig.debug
 
 source security/Kconfig
Index: linux-2.6-lttng/arch/blackfin/Kconfig
===
--- linux-2.6-lttng.orig/arch/blackfin/Kconfig  2007-11-15 22:15:16.0 
-0500
+++ linux-2.6-lttng/arch/blackfin/Kconfig   2007-11-15 22:15:27.0 
-0500
@@ -1074,8 +1074,6 @@ source drivers/Kconfig
 
 source fs/Kconfig
 
-source kernel/Kconfig.instrumentation
-
 menu Kernel hacking
 
 source lib/Kconfig.debug
Index: linux-2.6-lttng/arch/cris/Kconfig

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-13 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 ++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 34 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-11 22:01:40.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-11 22:02:03.0 -0500
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate "OProfile system profiling (EXPERIMENTAL)"
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool "Kprobes"
+   depends on KALLSYMS && MODULES
+   depends on ARCH_SUPPORTS_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".
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-11 22:01:40.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-11 22:02:32.0 -0500
@@ -644,6 +644,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
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-11 
22:01:56.0 -0500
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool "Instrumentation Support"
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool "Kprobes"
-   depends on KALLSYMS && MODULES
-   depends on 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-13 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 ++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 34 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-11 22:01:40.0 -0500
+++ linux-2.6-lttng/arch/Kconfig2007-11-11 22:02:03.0 -0500
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate OProfile system profiling (EXPERIMENTAL)
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool Kprobes
+   depends on KALLSYMS  MODULES
+   depends on ARCH_SUPPORTS_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.
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-11 22:01:40.0 -0500
+++ linux-2.6-lttng/init/Kconfig2007-11-11 22:02:32.0 -0500
@@ -644,6 +644,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
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-11 
22:01:56.0 -0500
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool Instrumentation Support
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool Kprobes
-   depends on KALLSYMS  MODULES
-   depends on ARCH_SUPPORTS_KPROBES
-   help
-   

Re: [patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-07 Thread Haavard Skinnemoen
On Tue, 06 Nov 2007 15:37:28 -0500
Mathieu Desnoyers <[EMAIL PROTECTED]> wrote:

> Index: linux-2.6-lttng/init/Kconfig
> ===
> --- linux-2.6-lttng.orig/init/Kconfig 2007-11-02 13:16:41.0 -0400
> +++ linux-2.6-lttng/init/Kconfig  2007-11-02 13:16:55.0 -0400
> @@ -644,6 +644,20 @@ config SLOB

> +source "ltt/Kconfig"

This one seems to be new, and I can't seem to find ltt/Kconfig
anywhere. Wouldn't it be better to move it to a separate patch?

Håvard
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-07 Thread Haavard Skinnemoen
On Tue, 06 Nov 2007 15:37:28 -0500
Mathieu Desnoyers [EMAIL PROTECTED] wrote:

 Index: linux-2.6-lttng/init/Kconfig
 ===
 --- linux-2.6-lttng.orig/init/Kconfig 2007-11-02 13:16:41.0 -0400
 +++ linux-2.6-lttng/init/Kconfig  2007-11-02 13:16:55.0 -0400
 @@ -644,6 +644,20 @@ config SLOB

 +source ltt/Kconfig

This one seems to be new, and I can't seem to find ltt/Kconfig
anywhere. Wouldn't it be better to move it to a separate patch?

Håvard
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-06 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   14 +++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 36 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-02 13:16:41.0 -0400
+++ linux-2.6-lttng/arch/Kconfig2007-11-02 13:16:55.0 -0400
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate "OProfile system profiling (EXPERIMENTAL)"
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool "Kprobes"
+   depends on KALLSYMS && MODULES
+   depends on ARCH_SUPPORTS_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".
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-02 13:16:41.0 -0400
+++ linux-2.6-lttng/init/Kconfig2007-11-02 13:16:55.0 -0400
@@ -644,6 +644,20 @@ 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 "ltt/Kconfig"
+
 source "arch/Kconfig"
 
 endmenu# General setup
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-02 
13:16:41.0 -0400
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool "Instrumentation Support"
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool "Kprobes"
-   depends on KALLSYMS && 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-11-06 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   14 +++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 36 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng/arch/Kconfig
===
--- linux-2.6-lttng.orig/arch/Kconfig   2007-11-02 13:16:41.0 -0400
+++ linux-2.6-lttng/arch/Kconfig2007-11-02 13:16:55.0 -0400
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate OProfile system profiling (EXPERIMENTAL)
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool Kprobes
+   depends on KALLSYMS  MODULES
+   depends on ARCH_SUPPORTS_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.
Index: linux-2.6-lttng/init/Kconfig
===
--- linux-2.6-lttng.orig/init/Kconfig   2007-11-02 13:16:41.0 -0400
+++ linux-2.6-lttng/init/Kconfig2007-11-02 13:16:55.0 -0400
@@ -644,6 +644,20 @@ 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 ltt/Kconfig
+
 source arch/Kconfig
 
 endmenu# General setup
Index: linux-2.6-lttng/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.orig/kernel/Kconfig.instrumentation 2007-11-02 
13:16:41.0 -0400
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool Instrumentation Support
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool Kprobes
-   depends on KALLSYMS  MODULES
-   depends on 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-10-30 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 ++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 34 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng.stable/arch/Kconfig
===
--- linux-2.6-lttng.stable.orig/arch/Kconfig2007-10-30 20:56:31.0 
-0400
+++ linux-2.6-lttng.stable/arch/Kconfig 2007-10-30 21:02:17.0 -0400
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate "OProfile system profiling (EXPERIMENTAL)"
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool "Kprobes"
+   depends on KALLSYMS && MODULES
+   depends on ARCH_SUPPORTS_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".
Index: linux-2.6-lttng.stable/init/Kconfig
===
--- linux-2.6-lttng.stable.orig/init/Kconfig2007-10-30 20:56:32.0 
-0400
+++ linux-2.6-lttng.stable/init/Kconfig 2007-10-30 21:02:17.0 -0400
@@ -644,6 +644,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
Index: linux-2.6-lttng.stable/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.stable.orig/kernel/Kconfig.instrumentation  2007-10-30 
21:02:03.0 -0400
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool "Instrumentation Support"
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool "Kprobes"
-   depends 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-10-30 Thread Mathieu Desnoyers
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 <[EMAIL PROTECTED]>
CC: Linus Torvalds <[EMAIL PROTECTED]>
CC: Sam Ravnborg <[EMAIL PROTECTED]>
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 ++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 34 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng.stable/arch/Kconfig
===
--- linux-2.6-lttng.stable.orig/arch/Kconfig2007-10-30 20:20:32.0 
-0400
+++ linux-2.6-lttng.stable/arch/Kconfig 2007-10-30 20:21:07.0 -0400
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate "OProfile system profiling (EXPERIMENTAL)"
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool "Kprobes"
+   depends on KALLSYMS && MODULES
+   depends on ARCH_SUPPORTS_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".
Index: linux-2.6-lttng.stable/init/Kconfig
===
--- linux-2.6-lttng.stable.orig/init/Kconfig2007-10-30 20:21:04.0 
-0400
+++ linux-2.6-lttng.stable/init/Kconfig 2007-10-30 20:21:27.0 -0400
@@ -644,6 +644,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
Index: linux-2.6-lttng.stable/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.stable.orig/kernel/Kconfig.instrumentation  2007-10-30 
20:21:07.0 -0400
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool "Instrumentation Support"
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool "Kprobes"
-   depends 

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-10-30 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 ++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 34 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng.stable/arch/Kconfig
===
--- linux-2.6-lttng.stable.orig/arch/Kconfig2007-10-30 20:20:32.0 
-0400
+++ linux-2.6-lttng.stable/arch/Kconfig 2007-10-30 20:21:07.0 -0400
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate OProfile system profiling (EXPERIMENTAL)
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool Kprobes
+   depends on KALLSYMS  MODULES
+   depends on ARCH_SUPPORTS_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.
Index: linux-2.6-lttng.stable/init/Kconfig
===
--- linux-2.6-lttng.stable.orig/init/Kconfig2007-10-30 20:21:04.0 
-0400
+++ linux-2.6-lttng.stable/init/Kconfig 2007-10-30 20:21:27.0 -0400
@@ -644,6 +644,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
Index: linux-2.6-lttng.stable/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.stable.orig/kernel/Kconfig.instrumentation  2007-10-30 
20:21:07.0 -0400
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool Instrumentation Support
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool Kprobes
-   depends on KALLSYMS  MODULES
-   

[patch 4/4] Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig

2007-10-30 Thread Mathieu Desnoyers
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 [EMAIL PROTECTED]
CC: Linus Torvalds [EMAIL PROTECTED]
CC: Sam Ravnborg [EMAIL PROTECTED]
---
 arch/Kconfig   |   22 ++
 arch/alpha/Kconfig |2 -
 arch/arm/Kconfig   |2 -
 arch/blackfin/Kconfig  |2 -
 arch/cris/Kconfig  |2 -
 arch/frv/Kconfig   |2 -
 arch/h8300/Kconfig |2 -
 arch/ia64/Kconfig  |2 -
 arch/m32r/Kconfig  |2 -
 arch/m68k/Kconfig  |2 -
 arch/m68knommu/Kconfig |2 -
 arch/mips/Kconfig  |2 -
 arch/parisc/Kconfig|2 -
 arch/powerpc/Kconfig   |2 -
 arch/ppc/Kconfig   |2 -
 arch/s390/Kconfig  |2 -
 arch/sh/Kconfig|2 -
 arch/sh64/Kconfig  |2 -
 arch/sparc/Kconfig |2 -
 arch/sparc64/Kconfig   |2 -
 arch/um/Kconfig|2 -
 arch/v850/Kconfig  |2 -
 arch/x86/Kconfig.i386  |2 -
 arch/x86/Kconfig.x86_64|2 -
 arch/xtensa/Kconfig|2 -
 init/Kconfig   |   12 ++
 kernel/Kconfig.instrumentation |   49 -
 27 files changed, 34 insertions(+), 97 deletions(-)

Index: linux-2.6-lttng.stable/arch/Kconfig
===
--- linux-2.6-lttng.stable.orig/arch/Kconfig2007-10-30 20:56:31.0 
-0400
+++ linux-2.6-lttng.stable/arch/Kconfig 2007-10-30 21:02:17.0 -0400
@@ -1,3 +1,25 @@
 #
 # General architecture dependent options
 #
+
+config OPROFILE
+   tristate OProfile system profiling (EXPERIMENTAL)
+   depends on PROFILING
+   depends on ARCH_SUPPORTS_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 KPROBES
+   bool Kprobes
+   depends on KALLSYMS  MODULES
+   depends on ARCH_SUPPORTS_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.
Index: linux-2.6-lttng.stable/init/Kconfig
===
--- linux-2.6-lttng.stable.orig/init/Kconfig2007-10-30 20:56:32.0 
-0400
+++ linux-2.6-lttng.stable/init/Kconfig 2007-10-30 21:02:17.0 -0400
@@ -644,6 +644,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
Index: linux-2.6-lttng.stable/kernel/Kconfig.instrumentation
===
--- linux-2.6-lttng.stable.orig/kernel/Kconfig.instrumentation  2007-10-30 
21:02:03.0 -0400
+++ /dev/null   1970-01-01 00:00:00.0 +
@@ -1,49 +0,0 @@
-menuconfig INSTRUMENTATION
-   bool Instrumentation Support
-   default y
-   ---help---
- Say Y here to get to see options related to performance measurement,
- system-wide debugging, and testing. This option alone does not add any
- kernel code.
-
- If you say N, all options in this submenu will be skipped and
- disabled. If you're trying to debug the kernel itself, go see the
- Kernel Hacking menu.
-
-if INSTRUMENTATION
-
-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
-   depends on ARCH_SUPPORTS_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 KPROBES
-   bool Kprobes
-   depends on KALLSYMS  MODULES
-