From: Mathieu Desnoyers - Change struct __mark_marker to struct marker. Signed-off-by: Mathieu Desnoyers Cc: Rusty Russell Signed-off-by: Andrew Morton --- diff -puN samples/markers/probe-example.c~linux-kernel-markers-samples-coding-style-fix samples/markers/probe-example.c --- a/samples/markers/probe-example.c~linux-kernel-markers-samples-coding-style-fix +++ a/samples/markers/probe-example.c @@ -20,8 +20,8 @@ struct probe_data { marker_probe_func *probe_func; }; -void probe_subsystem_event(const struct __mark_marker *mdata, - void *private, const char *format, ...) +void probe_subsystem_event(const struct marker *mdata, void *private, + const char *format, ...) { va_list ap; /* Declare args */ @@ -43,8 +43,8 @@ void probe_subsystem_event(const struct atomic_t eventb_count = ATOMIC_INIT(0); -void probe_subsystem_eventb(const struct __mark_marker *mdata, - void *private, const char *format, ...) +void probe_subsystem_eventb(const struct marker *mdata, void *private, + const char *format, ...) { /* Increment counter */ atomic_inc(&eventb_count); _