buffers.c: fix compilation issue

[ust.git] / libust / channels.h

diff --git a/libust/channels.h b/libust/channels.h
index 0b179e5cc670fe1b75f765a66d0b5f253d41e709..6f57f13de6de2b7c58800b5bda5d284f7f0f31ea 100644 (file)
--- a/libust/channels.h
+++ b/libust/channels.h
@@ -1,5 +1,5 @@
-#ifndef _LTT_CHANNELS_H
-#define _LTT_CHANNELS_H
+#ifndef UST_CHANNELS_H
+#define UST_CHANNELS_H
 
 /*
  * Copyright (C) 2008 Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca)
@@ -28,6 +28,7 @@
 #include <kcompat/kref.h>
 
 #define EVENTS_PER_CHANNEL     65536
+#define MAX_CPUS               32
 
 struct ltt_trace_struct;
 
@@ -36,7 +37,8 @@ struct ust_buffer;
 struct ust_channel {
        /* First 32 bytes cache-hot cacheline */
        struct ltt_trace_struct *trace;
-       void *buf;
+       int *buf_struct_shmids;
+       struct ust_buffer **buf;
        int overwrite:1;
        int active:1;
        unsigned int n_subbufs_order;
@@ -65,8 +67,7 @@ struct ust_channel {
        int subbuf_size_order;
        unsigned int subbuf_cnt;
        const char *channel_name;
-
-       int buf_shmid;
+       int n_cpus;
 
        u32 version;
        size_t alloc_size;
@@ -97,4 +98,4 @@ extern void ltt_channels_trace_free(struct ust_channel *channels);
 extern int _ltt_channels_get_event_id(const char *channel, const char *name);
 extern int ltt_channels_get_event_id(const char *channel, const char *name);
 
-#endif /* _LTT_CHANNELS_H */
+#endif /* UST_CHANNELS_H */