The patch titled linux-kernel-markers-powerpc-optimization update has been added to the -mm tree. Its filename is linux-kernel-markers-powerpc-optimization-update.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: linux-kernel-markers-powerpc-optimization update From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-powerpc/marker.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff -puN include/asm-powerpc/marker.h~linux-kernel-markers-powerpc-optimization-update include/asm-powerpc/marker.h --- a/include/asm-powerpc/marker.h~linux-kernel-markers-powerpc-optimization-update +++ a/include/asm-powerpc/marker.h @@ -20,7 +20,7 @@ #define MF_DEFAULT (MF_OPTIMIZED | MF_LOCKDEP | MF_PRINTK) /* Optimized version of the markers */ -#define MARK_OPTIMIZED(flags, name, format, args...) \ +#define trace_mark_optimized(flags, name, format, args...) \ do { \ static const char __mstrtab_name_##name[] \ __attribute__((section("__markers_strings"))) \ @@ -28,9 +28,13 @@ static const char __mstrtab_format_##name[] \ __attribute__((section("__markers_strings"))) \ = format; \ + static const char __mstrtab_args_##name[] \ + __attribute__((section("__markers_strings"))) \ + = #args; \ static struct __mark_marker_data __mark_data_##name \ __attribute__((section("__markers_data"))) = \ { __mstrtab_name_##name, __mstrtab_format_##name, \ + __mstrtab_args_##name, \ (flags) | MF_OPTIMIZED, __mark_empty_function, NULL }; \ char condition; \ asm volatile( ".section __markers, \"a\", @progbits;\n\t" \ @@ -55,9 +59,9 @@ #define _trace_mark(flags, format, args...) \ do { \ if ((flags) & MF_OPTIMIZED) \ - MARK_OPTIMIZED(flags, format, ## args); \ + trace_mark_optimized(flags, format, ## args); \ else \ - MARK_GENERIC(flags, format, ## args); \ + trace_mark_generic(flags, format, ## args); \ } while (0) /* Marker with default behavior */ _ Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are origin.patch x86_64-fix-default_do_nmi-missing-return-after-a-if.patch git-avr32.patch linux-kernel-markers-kconfig-menus.patch linux-kernel-markers-kconfig-menus-update.patch linux-kernel-markers-architecture-independant-code.patch linux-kernel-markers-architecture-independant-code-update.patch allow-userspace-applications-to-use-markerh-to-parse-the-markers-section-in-the-kernel-binary.patch linux-kernel-markers-powerpc-optimization.patch linux-kernel-markers-powerpc-optimization-update.patch linux-kernel-markers-i386-optimization.patch linux-kernel-markers-i386-optimization-update.patch linux-kernel-markers-non-optimized-architectures.patch linux-kernel-markers-non-optimized-architectures-update.patch linux-kernel-markers-documentation.patch linux-kernel-markers-documentation-update.patch markers-define-the-linker-macro-extra_rwdata.patch markers-use-extra_rwdata-in-architectures.patch port-of-blktrace-to-the-linux-kernel-markers.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html