* 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]>
> ---
>
> 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
-
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/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
