* [2.6 patch] x86: add instrumentation menu
@ 2007-10-22 2:48 Adrian Bunk
2007-10-22 3:38 ` Mathieu Desnoyers
2007-10-22 8:48 ` Thomas Gleixner
0 siblings, 2 replies; 3+ messages in thread
From: Adrian Bunk @ 2007-10-22 2:48 UTC (permalink / raw)
To: Mathieu Desnoyers; +Cc: linux-kernel, Thomas Gleixner, Ingo Molnar
It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete
due to a clash with the x86 architecture merge.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
arch/i386/Kconfig | 2 ++
arch/x86/oprofile/Kconfig | 17 -----------------
arch/x86_64/Kconfig | 2 ++
3 files changed, 4 insertions(+), 17 deletions(-)
e66850f5417ad721e75bf575b6ec49d7aec0af04
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f6e44fc..9e8a74f 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1258,6 +1258,8 @@ source "drivers/Kconfig"
source "fs/Kconfig"
+source "kernel/Kconfig.instrumentation"
+
source "arch/i386/Kconfig.debug"
source "security/Kconfig"
diff --git a/arch/x86/oprofile/Kconfig b/arch/x86/oprofile/Kconfig
deleted file mode 100644
index d8a8408..0000000
--- a/arch/x86/oprofile/Kconfig
+++ /dev/null
@@ -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.
-
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index aab25f3..106d5d5 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -801,6 +801,8 @@ source "drivers/firmware/Kconfig"
source fs/Kconfig
+source "kernel/Kconfig.instrumentation"
+
source "arch/x86_64/Kconfig.debug"
source "security/Kconfig"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [2.6 patch] x86: add instrumentation menu
2007-10-22 2:48 [2.6 patch] x86: add instrumentation menu Adrian Bunk
@ 2007-10-22 3:38 ` Mathieu Desnoyers
2007-10-22 8:48 ` Thomas Gleixner
1 sibling, 0 replies; 3+ messages in thread
From: Mathieu Desnoyers @ 2007-10-22 3:38 UTC (permalink / raw)
To: akpm, Adrian Bunk; +Cc: linux-kernel, Thomas Gleixner, Ingo Molnar
* Adrian Bunk (bunk@kernel.org) wrote:
> It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete
> due to a clash with the x86 architecture merge.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
>
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 <mathieu.desnoyers@polymtl.ca>
> ---
>
> arch/i386/Kconfig | 2 ++
> arch/x86/oprofile/Kconfig | 17 -----------------
> arch/x86_64/Kconfig | 2 ++
> 3 files changed, 4 insertions(+), 17 deletions(-)
>
> e66850f5417ad721e75bf575b6ec49d7aec0af04
> diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
> index f6e44fc..9e8a74f 100644
> --- a/arch/i386/Kconfig
> +++ b/arch/i386/Kconfig
> @@ -1258,6 +1258,8 @@ source "drivers/Kconfig"
>
> source "fs/Kconfig"
>
> +source "kernel/Kconfig.instrumentation"
> +
> source "arch/i386/Kconfig.debug"
>
> source "security/Kconfig"
> diff --git a/arch/x86/oprofile/Kconfig b/arch/x86/oprofile/Kconfig
> deleted file mode 100644
> index d8a8408..0000000
> --- a/arch/x86/oprofile/Kconfig
> +++ /dev/null
> @@ -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.
> -
> diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
> index aab25f3..106d5d5 100644
> --- a/arch/x86_64/Kconfig
> +++ b/arch/x86_64/Kconfig
> @@ -801,6 +801,8 @@ source "drivers/firmware/Kconfig"
>
> source fs/Kconfig
>
> +source "kernel/Kconfig.instrumentation"
> +
> source "arch/x86_64/Kconfig.debug"
>
> source "security/Kconfig"
>
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [2.6 patch] x86: add instrumentation menu
2007-10-22 2:48 [2.6 patch] x86: add instrumentation menu Adrian Bunk
2007-10-22 3:38 ` Mathieu Desnoyers
@ 2007-10-22 8:48 ` Thomas Gleixner
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Gleixner @ 2007-10-22 8:48 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Mathieu Desnoyers, linux-kernel, Ingo Molnar
On Mon, 22 Oct 2007, Adrian Bunk wrote:
> It seems commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9 was incomplete
> due to a clash with the x86 architecture merge.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
Applied, thanks. Will go Linus wards with our next pull request.
tglx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-22 8:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-22 2:48 [2.6 patch] x86: add instrumentation menu Adrian Bunk
2007-10-22 3:38 ` Mathieu Desnoyers
2007-10-22 8:48 ` Thomas Gleixner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox