This patch restores the ARMv6 OProfile support that was killed by
commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
Signed-off-by: Adrian Bunk <[email protected]>
---
kernel/Kconfig.instrumentation | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
7fc221ef169610b5eac98e2ddd641811c0d53e4a
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
index 468f47a..4453187 100644
--- a/kernel/Kconfig.instrumentation
+++ b/kernel/Kconfig.instrumentation
@@ -29,2 +29,17 @@ config OPROFILE
+config OPROFILE_ARMV6
+ bool
+ depends on OPROFILE && ARM && CPU_V6 && !SMP
+ default y
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_MPCORE
+ bool
+ depends on OPROFILE && ARM && CPU_V6 && SMP
+ default y
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_ARM11_CORE
+ bool
+
config KPROBES
* Adrian Bunk ([email protected]) wrote:
> This patch restores the ARMv6 OProfile support that was killed by
> commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
Yup, it must be put back, but I doubt stuffing it in
kernel/Kconfig.instrumentation is the best way to proceed, especially
since it will break the "instrumentation menu removal" patches currently
in -mm _and_ because this is arm-specific.
Why don't we simply put it in arch/arm/Kconfig ?
> ---
>
> kernel/Kconfig.instrumentation | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> 7fc221ef169610b5eac98e2ddd641811c0d53e4a
> diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
> index 468f47a..4453187 100644
> --- a/kernel/Kconfig.instrumentation
> +++ b/kernel/Kconfig.instrumentation
> @@ -29,2 +29,17 @@ config OPROFILE
>
> +config OPROFILE_ARMV6
> + bool
> + depends on OPROFILE && ARM && CPU_V6 && !SMP
> + default y
> + select OPROFILE_ARM11_CORE
> +
> +config OPROFILE_MPCORE
> + bool
> + depends on OPROFILE && ARM && CPU_V6 && SMP
> + default y
> + select OPROFILE_ARM11_CORE
> +
> +config OPROFILE_ARM11_CORE
> + bool
> +
> config KPROBES
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
On Fri, Dec 28, 2007 at 08:56:36PM +0200, Adrian Bunk wrote:
> This patch restores the ARMv6 OProfile support that was killed by
> commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
>
> Signed-off-by: Adrian Bunk <[email protected]>
Given where we are in the release cycle, I think this "cleanup" patch
should be reverted. Once the issues with it are resolved (why was it
never even CC'd to the arch maintainers for review?) then it can go
into mainline.
Note that it also looks like (from the commitdiff) that the above
mentioned commit also removes:
CONFIG_HARDWARE_PM (blackfin)
CONFIG_OPROFILE_CELL (powerpc)
So they're probably subtly broken as well.
Linus, what do you think? Should 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9
be reverted?
>
> ---
>
> kernel/Kconfig.instrumentation | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> 7fc221ef169610b5eac98e2ddd641811c0d53e4a
> diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
> index 468f47a..4453187 100644
> --- a/kernel/Kconfig.instrumentation
> +++ b/kernel/Kconfig.instrumentation
> @@ -29,2 +29,17 @@ config OPROFILE
>
> +config OPROFILE_ARMV6
> + bool
> + depends on OPROFILE && ARM && CPU_V6 && !SMP
> + default y
> + select OPROFILE_ARM11_CORE
> +
> +config OPROFILE_MPCORE
> + bool
> + depends on OPROFILE && ARM && CPU_V6 && SMP
> + default y
> + select OPROFILE_ARM11_CORE
> +
> +config OPROFILE_ARM11_CORE
> + bool
> +
> config KPROBES
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
Fix ARMv6 OProfile support
This patch restores the ARMv6 OProfile support that was killed by
commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
It puts the config options in arch/arm/Kconfig.
Signed-off-by: Mathieu Desnoyers <[email protected]>
CC: Adrian Bunk <[email protected]>
CC: Randy Dunlap <[email protected]>
CC: [email protected]
CC: [email protected]
CC: [email protected]
---
arch/arm/Kconfig | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig 2007-12-28 17:00:50.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig 2007-12-28 17:02:05.000000000 -0500
@@ -130,6 +130,25 @@ config FIQ
config ARCH_MTD_XIP
bool
+if OPROFILE
+
+config OPROFILE_ARMV6
+ bool
+ depends on CPU_V6 && !SMP
+ default y
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_MPCORE
+ bool
+ depends on CPU_V6 && SMP
+ default y
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_ARM11_CORE
+ bool
+
+endif
+
config VECTORS_BASE
hex
default 0xffff0000 if MMU || CPU_HIGH_VECTOR
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
On Sat, 29 Dec 2007 11:05:57 -0500 Mathieu Desnoyers wrote:
> Fix ARMv6 OProfile support
>
> This patch restores the ARMv6 OProfile support that was killed by
> commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
>
> It puts the config options in arch/arm/Kconfig.
>
> Signed-off-by: Mathieu Desnoyers <[email protected]>
> CC: Adrian Bunk <[email protected]>
> CC: Randy Dunlap <[email protected]>
> CC: [email protected]
> CC: [email protected]
> CC: [email protected]
> ---
> arch/arm/Kconfig | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> Index: linux-2.6-lttng/arch/arm/Kconfig
> ===================================================================
> --- linux-2.6-lttng.orig/arch/arm/Kconfig 2007-12-28 17:00:50.000000000 -0500
> +++ linux-2.6-lttng/arch/arm/Kconfig 2007-12-28 17:02:05.000000000 -0500
> @@ -130,6 +130,25 @@ config FIQ
> config ARCH_MTD_XIP
> bool
>
> +if OPROFILE
> +
> +config OPROFILE_ARMV6
> + bool
> + depends on CPU_V6 && !SMP
> + default y
> + select OPROFILE_ARM11_CORE
> +
> +config OPROFILE_MPCORE
> + bool
> + depends on CPU_V6 && SMP
> + default y
> + select OPROFILE_ARM11_CORE
Prefer to use "def_bool y" for the 2 config symbols above,
as you did in the Cell patch.
> +config OPROFILE_ARM11_CORE
> + bool
> +
> +endif
> +
> config VECTORS_BASE
> hex
> default 0xffff0000 if MMU || CPU_HIGH_VECTOR
---
~Randy
desserts: http://www.xenotime.net/linux/recipes/
This patch restores the ARMv6 OProfile support that was killed by
commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
It puts the config options in arch/arm/Kconfig.
Changelog :
Use def_bool.
Signed-off-by: Mathieu Desnoyers <[email protected]>
CC: Adrian Bunk <[email protected]>
CC: Randy Dunlap <[email protected]>
CC: [email protected]
CC: [email protected]
CC: [email protected]
---
arch/arm/Kconfig | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
Index: linux-2.6-lttng/arch/arm/Kconfig
===================================================================
--- linux-2.6-lttng.orig/arch/arm/Kconfig 2007-12-29 16:58:32.000000000 -0500
+++ linux-2.6-lttng/arch/arm/Kconfig 2007-12-29 16:59:25.000000000 -0500
@@ -130,6 +130,23 @@ config FIQ
config ARCH_MTD_XIP
bool
+if OPROFILE
+
+config OPROFILE_ARMV6
+ def_bool y
+ depends on CPU_V6 && !SMP
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_MPCORE
+ def_bool y
+ depends on CPU_V6 && SMP
+ select OPROFILE_ARM11_CORE
+
+config OPROFILE_ARM11_CORE
+ bool
+
+endif
+
config VECTORS_BASE
hex
default 0xffff0000 if MMU || CPU_HIGH_VECTOR
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
* Mathieu Desnoyers ([email protected]) wrote:
> Fix ARMv6 OProfile support
>
> This patch restores the ARMv6 OProfile support that was killed by
> commit 09cadedbdc01f1a4bea1f427d4fb4642eaa19da9.
>
> It puts the config options in arch/arm/Kconfig.
>
This patch header should also include :
Problem identified by Adrian Bunk. Patch inspired by the original fix
proposed by him.
Thanks,
Mathieu
> Signed-off-by: Mathieu Desnoyers <[email protected]>
> CC: Adrian Bunk <[email protected]>
> CC: Randy Dunlap <[email protected]>
> CC: [email protected]
> CC: [email protected]
> CC: [email protected]
> ---
> arch/arm/Kconfig | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> Index: linux-2.6-lttng/arch/arm/Kconfig
> ===================================================================
> --- linux-2.6-lttng.orig/arch/arm/Kconfig 2007-12-28 17:00:50.000000000 -0500
> +++ linux-2.6-lttng/arch/arm/Kconfig 2007-12-28 17:02:05.000000000 -0500
> @@ -130,6 +130,25 @@ config FIQ
> config ARCH_MTD_XIP
> bool
>
> +if OPROFILE
> +
> +config OPROFILE_ARMV6
> + bool
> + depends on CPU_V6 && !SMP
> + default y
> + select OPROFILE_ARM11_CORE
> +
> +config OPROFILE_MPCORE
> + bool
> + depends on CPU_V6 && SMP
> + default y
> + select OPROFILE_ARM11_CORE
> +
> +config OPROFILE_ARM11_CORE
> + bool
> +
> +endif
> +
> config VECTORS_BASE
> hex
> default 0xffff0000 if MMU || CPU_HIGH_VECTOR
>
> --
> 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/
>
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68