diff options
Diffstat (limited to 'include/linux/marker.h')
| -rw-r--r-- | include/linux/marker.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/marker.h b/include/linux/marker.h index 430f6adf9762..338533abb47b 100644 --- a/include/linux/marker.h +++ b/include/linux/marker.h | |||
| @@ -44,8 +44,8 @@ struct marker { | |||
| 44 | */ | 44 | */ |
| 45 | char state; /* Marker state. */ | 45 | char state; /* Marker state. */ |
| 46 | char ptype; /* probe type : 0 : single, 1 : multi */ | 46 | char ptype; /* probe type : 0 : single, 1 : multi */ |
| 47 | void (*call)(const struct marker *mdata, /* Probe wrapper */ | 47 | /* Probe wrapper */ |
| 48 | void *call_private, const char *fmt, ...); | 48 | void (*call)(const struct marker *mdata, void *call_private, ...); |
| 49 | struct marker_probe_closure single; | 49 | struct marker_probe_closure single; |
| 50 | struct marker_probe_closure *multi; | 50 | struct marker_probe_closure *multi; |
| 51 | } __attribute__((aligned(8))); | 51 | } __attribute__((aligned(8))); |
| @@ -72,8 +72,7 @@ struct marker { | |||
| 72 | __mark_check_format(format, ## args); \ | 72 | __mark_check_format(format, ## args); \ |
| 73 | if (unlikely(__mark_##name.state)) { \ | 73 | if (unlikely(__mark_##name.state)) { \ |
| 74 | (*__mark_##name.call) \ | 74 | (*__mark_##name.call) \ |
| 75 | (&__mark_##name, call_private, \ | 75 | (&__mark_##name, call_private, ## args);\ |
| 76 | format, ## args); \ | ||
| 77 | } \ | 76 | } \ |
| 78 | } while (0) | 77 | } while (0) |
| 79 | 78 | ||
| @@ -117,9 +116,9 @@ static inline void __printf(1, 2) ___mark_check_format(const char *fmt, ...) | |||
| 117 | extern marker_probe_func __mark_empty_function; | 116 | extern marker_probe_func __mark_empty_function; |
| 118 | 117 | ||
| 119 | extern void marker_probe_cb(const struct marker *mdata, | 118 | extern void marker_probe_cb(const struct marker *mdata, |
| 120 | void *call_private, const char *fmt, ...); | 119 | void *call_private, ...); |
| 121 | extern void marker_probe_cb_noarg(const struct marker *mdata, | 120 | extern void marker_probe_cb_noarg(const struct marker *mdata, |
| 122 | void *call_private, const char *fmt, ...); | 121 | void *call_private, ...); |
| 123 | 122 | ||
| 124 | /* | 123 | /* |
| 125 | * Connect a probe to a marker. | 124 | * Connect a probe to a marker. |
