~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libust/tracer.h

  • 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:
27
27
#include <sys/types.h>
28
28
#include <stdarg.h>
29
29
//#include "list.h"
30
 
#include "kernelcompat.h"
 
30
#include <ust/kernelcompat.h>
31
31
#include "buffer.h"
32
32
#include "relay.h"
33
33
#include "channels.h"
34
34
#include "tracercore.h"
35
 
#include "marker.h"
 
35
#include <ust/marker.h>
36
36
 
37
37
/* Number of bytes to log with a read/write event */
38
38
#define LTT_LOG_RW_SIZE                 32L