Fix ARM to play nicely with generic Instrumentation menu
PATCH 1/1 Fix ARM to play nicely with generic Instrumentation menu
The conflicting commit for move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch is the ARM fix from Linus :
commit 38ad9aebe70dc72df08851bbd1620d89329129ba
He just seemed to agree that my approach (just putting the missing ARM config options in arch/arm/Kconfig) works too. The main advantage it has is that it is smaller, does not need a cleanup in the future and does not break the following patches unnecessarily.
It's just been discussed here
http://lkml.org/lkml/2008/1/15/267
However, Linus might prefer to stay with his own patch and I would totally understand it that late in the release cycle. Therefore I submit this for the next release cycle.
This patch cleans up the fix from Linus so it does not conflict with the following patches in -mm.
It applies on top of the current 2.6.24-rc7-git8 + possibly some more git commits (at commit 0938e7586440ac97cedc0f5528a8684ebfa4ce43).
After applying this patch, move-kconfiginstrumentation-to-arch-kconfig-and-init-kconfig.patch applies nicely in the -mm tree without any modification.
--- arch/arm/Kconfig | 2 - arch/arm/Kconfig.instrumentation | 52 --------------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-)
arch/arm/Kconfig +18 -1
@@ -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
@@ -1076,7 +1093,7 @@ endmenu source "fs/Kconfig" -source "arch/arm/Kconfig.instrumentation" +source "kernel/Kconfig.instrumentation" source "arch/arm/Kconfig.debug"
arch/arm/Kconfig.instrumentation deleted +0 -52
52 lines not on this page · raw message
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
Quoted 2 lines · Mathieu Desnoyers
This patch cleans up the fix from Linus so it does not conflict with the following patches in -mm.
What following patches?
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
Quoted 6 lines · * Russell King ([email protected]) wrote:
Quoted 2 lines · Mathieu Desnoyers
This patch cleans up the fix from Linus so it does not conflict with the following patches in -mm.
What following patches?
Instrumentation menu removal, which was in -mm until yesterday.
http://lkml.org/lkml/2007/12/8/81
I did this patch following a discussion with Linus about a month ago where I was proposing the creation of the instrumentation/ directory in the kernel sources to follow the menus/tree directories logic found in the rest of the kernel.
http://lkml.org/lkml/2007/10/30/318
Mathieu
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