* Mathieu Desnoyers ([email protected]) wrote:
> Linux Kernel Markers - Coding Style Fixes
>
> - Use struct marker instead of struct __mark_marker.
> - Change a "private_data" parameter name for "private".
> - DEFINE_MUTEX(markers_mutex) is made static.
>
> This patch applies after linux-kernel-markers.patch.
>
Hi Andrew,
Just to be precise wrt what you have, it applies right after:
linux-kernel-markers-checkpatch-fixes.patch
in your series.
Mathieu
> Signed-off-by: Mathieu Desnoyers <[email protected]>
> CC: Rusty Russell <[email protected]>
> ---
> include/linux/marker.h | 18 +++++++++---------
> include/linux/module.h | 2 +-
> kernel/marker.c | 22 ++++++++++------------
> 3 files changed, 20 insertions(+), 22 deletions(-)
>
> Index: linux-2.6-lttng/include/linux/marker.h
> ===================================================================
> --- linux-2.6-lttng.orig/include/linux/marker.h 2007-09-30 09:33:48.000000000 -0400
> +++ linux-2.6-lttng/include/linux/marker.h 2007-09-30 09:35:13.000000000 -0400
> @@ -15,11 +15,11 @@
> #include <linux/types.h>
>
> struct module;
> -struct __mark_marker;
> +struct marker;
>
> /**
> * marker_probe_func - Type of a marker probe function
> - * @mdata: pointer of type struct __mark_marker
> + * @mdata: pointer of type struct marker
> * @private_data: caller site private data
> * @fmt: format string
> * @...: variable argument list
> @@ -27,10 +27,10 @@ struct __mark_marker;
> * Type of marker probe functions. They receive the mdata and need to parse the
> * format string to recover the variable argument list.
> */
> -typedef void marker_probe_func(const struct __mark_marker *mdata,
> +typedef void marker_probe_func(const struct marker *mdata,
> void *private_data, const char *fmt, ...);
>
> -struct __mark_marker {
> +struct marker {
> const char *name; /* Marker name */
> const char *format; /* Marker format string, describing the
> * variable argument list.
> @@ -57,7 +57,7 @@ struct __mark_marker {
> static const char __mstrtab_format_##name[] \
> __attribute__((section("__markers_strings"))) \
> = format; \
> - static struct __mark_marker __mark_##name \
> + static struct marker __mark_##name \
> __attribute__((section("__markers"))) = \
> { __mstrtab_name_##name, __mstrtab_format_##name, \
> 0, __mark_empty_function, NULL }; \
> @@ -72,13 +72,13 @@ struct __mark_marker {
> } \
> } while (0)
>
> -extern void marker_update_probe_range(struct __mark_marker *begin,
> - struct __mark_marker *end, struct module *probe_module, int *refcount);
> +extern void marker_update_probe_range(struct marker *begin,
> + struct marker *end, struct module *probe_module, int *refcount);
> #else /* !CONFIG_MARKERS */
> #define __trace_mark(name, call_data, format, args...) \
> __mark_check_format(format, ## args)
> -static inline void marker_update_probe_range(struct __mark_marker *begin,
> - struct __mark_marker *end, struct module *probe_module, int *refcount)
> +static inline void marker_update_probe_range(struct marker *begin,
> + struct marker *end, struct module *probe_module, int *refcount)
> { }
> #endif /* CONFIG_MARKERS */
>
> Index: linux-2.6-lttng/include/linux/module.h
> ===================================================================
> --- linux-2.6-lttng.orig/include/linux/module.h 2007-09-30 09:35:26.000000000 -0400
> +++ linux-2.6-lttng/include/linux/module.h 2007-09-30 09:35:35.000000000 -0400
> @@ -372,7 +372,7 @@ struct module
> keeping pointers to this stuff */
> char *args;
> #ifdef CONFIG_MARKERS
> - struct __mark_marker *markers;
> + struct marker *markers;
> unsigned int num_markers;
> #endif
> };
> Index: linux-2.6-lttng/kernel/marker.c
> ===================================================================
> --- linux-2.6-lttng.orig/kernel/marker.c 2007-09-30 09:35:48.000000000 -0400
> +++ linux-2.6-lttng/kernel/marker.c 2007-09-30 09:44:14.000000000 -0400
> @@ -24,14 +24,14 @@
> #include <linux/marker.h>
> #include <linux/err.h>
>
> -extern struct __mark_marker __start___markers[];
> -extern struct __mark_marker __stop___markers[];
> +extern struct marker __start___markers[];
> +extern struct marker __stop___markers[];
>
> /*
> * module_mutex nests inside markers_mutex. Markers mutex protects the builtin
> * and module markers, the hash table and deferred_sync.
> */
> -DEFINE_MUTEX(markers_mutex);
> +static DEFINE_MUTEX(markers_mutex);
>
> /*
> * Marker deferred synchronization.
> @@ -63,7 +63,7 @@ static struct hlist_head marker_table[MA
>
> /**
> * __mark_empty_function - Empty probe callback
> - * @mdata: pointer of type const struct __mark_marker
> + * @mdata: pointer of type const struct marker
> * @fmt: format string
> * @...: variable argument list
> *
> @@ -72,8 +72,7 @@ static struct hlist_head marker_table[MA
> * though the function pointer change and the marker enabling are two distinct
> * operations that modifies the execution flow of preemptible code.
> */
> -void __mark_empty_function(const struct __mark_marker *mdata,
> - void *private_data,
> +void __mark_empty_function(const struct marker *mdata, void *private,
> const char *fmt, ...)
> {
> }
> @@ -207,8 +206,7 @@ static int marker_set_format(struct mark
> /*
> * Sets the probe callback corresponding to one marker.
> */
> -static int set_marker(struct marker_entry **entry,
> - struct __mark_marker *elem)
> +static int set_marker(struct marker_entry **entry, struct marker *elem)
> {
> int ret;
> WARN_ON(strcmp((*entry)->name, elem->name) != 0);
> @@ -240,7 +238,7 @@ static int set_marker(struct marker_entr
> * empty function insures that the original callback is not used anymore. This
> * insured by preemption disabling around the call site.
> */
> -static void disable_marker(struct __mark_marker *elem)
> +static void disable_marker(struct marker *elem)
> {
> elem->state = 0;
> elem->call = __mark_empty_function;
> @@ -261,11 +259,11 @@ static void disable_marker(struct __mark
> * Updates the probe callback corresponding to a range of markers.
> * Must be called with markers_mutex held.
> */
> -void marker_update_probe_range(struct __mark_marker *begin,
> - struct __mark_marker *end, struct module *probe_module,
> +void marker_update_probe_range(struct marker *begin,
> + struct marker *end, struct module *probe_module,
> int *refcount)
> {
> - struct __mark_marker *iter;
> + struct marker *iter;
> struct marker_entry *mark_entry;
>
> for (iter = begin; iter < end; iter++) {
> --
> Mathieu Desnoyers
> Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
> OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
