Fix ARM to play nicely with generic Instrumentation menu
authorMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Sat, 2 Feb 2008 20:10:32 +0000 (15:10 -0500)
committerSam Ravnborg <sam@ravnborg.org>
Sun, 3 Feb 2008 07:58:07 +0000 (08:58 +0100)
commitc0ffa3a951668734a635cd1e26bf7583795854c5
tree5fc4f5de59a09edb24d69f563e8b74d2cdc6d6b4
parent603d49885e023d1f68c627c2a2db599fb40eefec
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.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
CC: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
arch/arm/Kconfig
arch/arm/Kconfig.instrumentation [deleted file]
kernel/Kconfig.instrumentation