Re: [2.6 patch] x86: add instrumentation menu

2007-10-22 Thread Thomas Gleixner
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 <[EMAIL PROTECTED]> Applied, thanks. Will go Linus wards with our next pull request. tglx

Re: [2.6 patch] x86: add instrumentation menu

2007-10-22 Thread Thomas Gleixner
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 [EMAIL PROTECTED] Applied, thanks. Will go Linus wards with our next pull request. tglx - To

Re: [2.6 patch] x86: add instrumentation menu

2007-10-21 Thread Mathieu Desnoyers
* 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

[2.6 patch] x86: add instrumentation menu

2007-10-21 Thread Adrian Bunk
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

[2.6 patch] x86: add instrumentation menu

2007-10-21 Thread Adrian Bunk
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 ++

Re: [2.6 patch] x86: add instrumentation menu

2007-10-21 Thread Mathieu Desnoyers
* 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