~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libust/tracer.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:
54
54
//ust// #include <asm/atomic.h>
55
55
#include <urcu/rculist.h>
56
56
 
57
 
#include "kernelcompat.h"
 
57
#include <ust/kernelcompat.h>
58
58
#include "tracercore.h"
59
59
#include "tracer.h"
60
60
#include "usterr.h"