The same happened on i386 and x86_64. I guess some bits from the combine-instrumentation-menus-in-kernel-kconfiginstrumentation.patch were lost during the mainline merge.
Andrew, could you forward this patch to Linus ? It applies on top of the current 2.6.23 git HEAD. Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]> --- arch/i386/Kconfig | 2 ++ arch/x86_64/Kconfig | 2 ++ 2 files changed, 4 insertions(+) Index: linux-2.6-lttng.stable/arch/i386/Kconfig =================================================================== --- linux-2.6-lttng.stable.orig/arch/i386/Kconfig 2007-10-20 11:59:39.000000000 -0400 +++ linux-2.6-lttng.stable/arch/i386/Kconfig 2007-10-20 11:59:41.000000000 -0400 @@ -1258,6 +1258,8 @@ source "drivers/Kconfig" source "fs/Kconfig" +source "kernel/Kconfig.instrumentation" + source "arch/i386/Kconfig.debug" source "security/Kconfig" Index: linux-2.6-lttng.stable/arch/x86_64/Kconfig =================================================================== --- linux-2.6-lttng.stable.orig/arch/x86_64/Kconfig 2007-10-20 12:00:09.000000000 -0400 +++ linux-2.6-lttng.stable/arch/x86_64/Kconfig 2007-10-20 12:00:18.000000000 -0400 @@ -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/
