The patch titled markers: alpha and avr32 supportAdd alpha marker.h, add arm26 marker.h has been removed from the -mm tree. Its filename was markers-alpha-and-avr32-supportadd-alpha-markerh-add-arm26-markerh.patch This patch was dropped because it is obsolete ------------------------------------------------------ Subject: markers: alpha and avr32 supportAdd alpha marker.h, add arm26 marker.h From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> use the new MF_* bitmask for asm-generic/marker.h. Document asm-generic/marker.h. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Cc: Ian Molton <spyro@xxxxxxx> Cc: Richard Henderson <rth@xxxxxxxxxxx> Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-alpha/marker.h | 13 +++++++++++++ include/asm-arm26/marker.h | 13 +++++++++++++ include/asm-generic/marker.h | 11 +++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff -puN /dev/null include/asm-alpha/marker.h --- /dev/null +++ a/include/asm-alpha/marker.h @@ -0,0 +1,13 @@ +/* + * marker.h + * + * Code markup for dynamic and static tracing. Architecture specific + * optimisations. + * + * No optimisation implemented. + * + * This file is released under the GPLv2. + * See the file COPYING for more details. + */ + +#include <asm-generic/marker.h> diff -puN /dev/null include/asm-arm26/marker.h --- /dev/null +++ a/include/asm-arm26/marker.h @@ -0,0 +1,13 @@ +/* + * marker.h + * + * Code markup for dynamic and static tracing. Architecture specific + * optimisations. + * + * No optimisation implemented. + * + * This file is released under the GPLv2. + * See the file COPYING for more details. + */ + +#include <asm-generic/marker.h> diff -puN include/asm-generic/marker.h~markers-alpha-and-avr32-supportadd-alpha-markerh-add-arm26-markerh include/asm-generic/marker.h --- a/include/asm-generic/marker.h~markers-alpha-and-avr32-supportadd-alpha-markerh-add-arm26-markerh +++ a/include/asm-generic/marker.h @@ -13,11 +13,18 @@ * "used" attribute to fix a gcc 4.1.x bug. */ -#define _MF_DEFAULT (_MF_LOCKDEP | _MF_PRINTK) +/* Default flags, used by trace_mark() */ +#define MF_DEFAULT (MF_LOCKDEP | MF_PRINTK) +/* Fallback on the generic markers, since no optimized version is available */ #define MARK_OPTIMIZED MARK_GENERIC #define _MARK MARK_GENERIC -#define trace_mark(format, args...) _trace_mark(_MF_DEFAULT, format, ## args) + +/* Marker with default behavior */ +#define trace_mark(format, args...) _trace_mark(MF_DEFAULT, format, ## args) + +/* Architecture dependant marker information, used internally for marker + * activation. */ #define MARK_OPTIMIZED_ENABLE_IMMEDIATE_OFFSET \ MARK_GENERIC_ENABLE_IMMEDIATE_OFFSET _ 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 markers-alpha-and-avr32-supportadd-alpha-markerh-add-arm26-markerh.patch linux-kernel-markers-documentation.patch markers-define-the-linker-macro-extra_rwdata.patch markers-use-extra_rwdata-in-architectures.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