~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libust/marker-control.c

  • Committer: Pierre-Marc Fournier
  • Date: 2009-10-27 22:58:15 UTC
  • mfrom: (232.1.5)
  • Revision ID: git-v1:aa08b4413291fabcbd1b1144377d37034ad361de
Merge branch 'for-pierre-marc' of git://git.infradead.org/users/jblunck/ust

Fixed conflicts:
        include/ust/marker.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
//ust// #include <linux/slab.h>
34
34
#include <ctype.h>
35
35
 
36
 
#include "kernelcompat.h"
 
36
#include <ust/kernelcompat.h>
37
37
//#include "list.h"
38
38
#include "tracer.h"
39
 
#include "localerr.h"
 
39
#include "usterr.h"
40
40
 
41
41
#define DEFAULT_CHANNEL "cpu"
42
42
#define DEFAULT_PROBE "default"