[ltt-dev] [PATCH] fix build error of marker.c

[compudj@krystal.dyndns.org (Mathieu Desnoyers)]

* KOSAKI Motohiro (kosaki.motohiro at jp.fujitsu.com) wrote:
> Hi Mathieu,
> 
> I got lttng from following tree.
> but it can't build.
> 
> $ git-clone  git://git.kernel.org/pub/scm/linux/kernel/git/compudj/linux-2.6-lttng.git
> 
> Perhaps, I got code form wrong git repo?
> 

Hi Kosaki,

Ah, it's been a while I've enabled the "userspace markers ABI" option in
my test tree. So yes, I broke it by changing the markers mutexes. I am
releasing LTTng 0.49 at the moment which fixes the problem. Your fix
does not follow the new locking semantics of marker.c, I now use
"lock_modules()" to protect the markers rather than markers_mutex.

And yes, you are using the correct git repository.

Thanks for reporting this issue.

Mathieu

> 
> 
> Patch against: head of the repository of git://git.kernel.org/pub/scm/linux/kernel/git/compudj/linux-2.6-lttng.git
> 
> ------------------------------------------------
> fix following build error.
> 
> 
>   CC      kernel/marker.o
> kernel/marker.c: In function ?sys_marker?:
> kernel/marker.c:993: error: ?markers_mutex? undeclared (first use in this function)
> kernel/marker.c:993: error: (Each undeclared identifier is reported only once
> kernel/marker.c:993: error: for each function it appears in.)
> kernel/marker.c: In function ?marker_update_processes?:
> kernel/marker.c:1081: error: ?markers_mutex? undeclared (first use in this function)
> kernel/marker.c: In function ?marker_update_process?:
> kernel/marker.c:1111: error: ?markers_mutex? undeclared (first use in this function)
> kernel/marker.c: In function ?exit_user_markers?:
> kernel/marker.c:1159: error: ?markers_mutex? undeclared (first use in this function)
> kernel/marker.c: In function ?is_marker_enabled?:
> kernel/marker.c:1175: error: ?markers_mutex? undeclared (first use in this function)
> 
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
> 
> ---
>  kernel/marker.c |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> Index: b/kernel/marker.c
> ===================================================================
> --- a/kernel/marker.c	2008-10-28 12:42:14.000000000 +0900
> +++ b/kernel/marker.c	2008-10-28 13:46:49.000000000 +0900
> @@ -36,6 +36,12 @@ extern struct marker __stop___markers[];
>  static const int marker_debug;
>  
>  /*
> + * markers_mutex nests inside module_mutex. Markers mutex protects the builtin
> + * and module markers and the hash table.
> + */
> +static DEFINE_MUTEX(markers_mutex);
> +
> +/*
>   * Marker hash table, containing the active markers.
>   * lock_modules() protects the builtin and module markers and the hash table.
>   */
> 
> 
> 
> _______________________________________________
> ltt-dev mailing list
> ltt-dev at lists.casi.polymtl.ca
> http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
> 

-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68