Skip to contentSkip to conversation

x86: add instrumentation menu

PATCH Applied Adrian Bunk 3 participants 3 messages Oct 22, 2007 x86

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 x86: add instrumentation menu

It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete due to a clash with the x86 architecture merge.

Signed-off-by Adrian Bunk <[email protected]>

---

 arch/i386/Kconfig         |    2 ++
 arch/x86/oprofile/Kconfig |   17 -----------------
 arch/x86_64/Kconfig       |    2 ++
 3 files changed, 4 insertions(+), 17 deletions(-)

e66850f5417ad721e75bf575b6ec49d7aec0af04

arch/i386/Kconfig +2 -0
index f6e44fc..9e8a74f 100644
@@ -1258,6 +1258,8 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/i386/Kconfig.debug"
 
 source "security/Kconfig"
arch/x86/oprofile/Kconfig deleted +0 -17
deleted file mode 100644
index d8a8408..0000000
@@ -1,17 +0,0 @@
-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.
-
arch/x86_64/Kconfig +2 -0
index aab25f3..106d5d5 100644
@@ -801,6 +801,8 @@ source "drivers/firmware/Kconfig"
 
 source fs/Kconfig
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/x86_64/Kconfig.debug"
 
 source "security/Kconfig"
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · * Adrian Bunk ([email protected]) wrote:

It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete due to a clash with the x86 architecture merge.

Signed-off-by Adrian Bunk <[email protected]>

Yes, my own fix only dealt with i386 and x86_64 Kconfig, without fixing the x86 architecture. This patch seems good.

Acked-by Mathieu Desnoyers <[email protected]>
Quoted 58 lines

---

 arch/i386/Kconfig         |    2 ++
 arch/x86/oprofile/Kconfig |   17 -----------------
 arch/x86_64/Kconfig       |    2 ++
 3 files changed, 4 insertions(+), 17 deletions(-)

e66850f5417ad721e75bf575b6ec49d7aec0af04

arch/i386/Kconfig +2 -0
index f6e44fc..9e8a74f 100644
@@ -1258,6 +1258,8 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/i386/Kconfig.debug"
 
 source "security/Kconfig"
arch/x86/oprofile/Kconfig deleted +0 -17
deleted file mode 100644
index d8a8408..0000000
@@ -1,17 +0,0 @@
-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.
-
arch/x86_64/Kconfig +2 -0
index aab25f3..106d5d5 100644
@@ -801,6 +801,8 @@ source "drivers/firmware/Kconfig"
 
 source fs/Kconfig
 
+source "kernel/Kconfig.instrumentation"
+
 source "arch/x86_64/Kconfig.debug"
 
 source "security/Kconfig"
Signature · 3 lines
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68