← Back to branch summary

~lttng/lttng-ust/lttng-ust

« back to all changes in this revision

Viewing changes to libust/tracercore.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:
libust/tracercore.c
22
22
//ust// #include <linux/percpu.h>
23
23
//ust// #include <linux/module.h>
24
24
//ust// #include <linux/debugfs.h>
25
 
#include "kernelcompat.h"
 
25
#include <ust/kernelcompat.h>
26
26
#include "tracercore.h"
27
27
 
28
28
/* Traces structures */