The patch titled
linux-kernel-markers-architecture-independant-code update
has been added to the -mm tree. Its filename is
linux-kernel-markers-architecture-independant-code-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-architecture-independant-code update
From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/marker.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff -puN include/linux/marker.h~linux-kernel-markers-architecture-independant-code-update include/linux/marker.h
--- a/include/linux/marker.h~linux-kernel-markers-architecture-independant-code-update
+++ a/include/linux/marker.h
@@ -24,6 +24,7 @@ typedef void marker_probe_func(const str
struct __mark_marker_data {
const char *name;
const char *format;
+ const char *args;
int flags;
marker_probe_func *call;
void *pdata;
@@ -44,10 +45,8 @@ struct __mark_marker {
#define MF_PRINTK (1 << 2) /* vprintk can be called in the probe */
#define _MF_NR 3 /* Number of marker flags */
-#define DECLARE_MARKER_DATA(flags, name, format) \
-
/* Generic marker flavor always available */
-#define MARK_GENERIC(flags, name, format, args...) \
+#define trace_mark_generic(flags, name, format, args...) \
do { \
static const char __mstrtab_name_##name[] \
__attribute__((section("__markers_strings"))) \
@@ -55,9 +54,13 @@ struct __mark_marker {
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 }; \
static char __marker_enable_##name = 0; \
static const struct __mark_marker __mark_##name \
_
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
