X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracer.h;h=b1fbf107c0ae7beba094729ee5ba4144f04345fc;hb=9df252731e9ee125dc691e512df8249c7a703655;hp=880affa262afd383515ab001d4c3473c30b68555;hpb=822f167a2f08bc6a4f81fbf2484dfea5f9b55e7a;p=lttng-ust.git

diff --git a/libust/tracer.h b/libust/tracer.h
index 880affa2..b1fbf107 100644
--- a/libust/tracer.h
+++ b/libust/tracer.h
@@ -112,7 +112,7 @@ enum marker_id {
 
 /* static ids 0-1 reserved for internal use. */
 #define MARKER_CORE_IDS		2
-static inline enum marker_id marker_id_type(uint16_t id)
+static __inline__ enum marker_id marker_id_type(uint16_t id)
 {
 	if (id < MARKER_CORE_IDS)
 		return (enum marker_id)id;
@@ -133,7 +133,7 @@ struct ltt_trace_ops {
 				void **transport_data, size_t data_size,
 				size_t *slot_size, long *buf_offset, u64 *tsc,
 				unsigned int *rflags,
-				int largest_align);
+				int largest_align, int cpu);
 //ust//	void (*commit_slot) (struct ltt_channel_struct *channel,
 //ust//				void **transport_data, long buf_offset,
 //ust//				size_t slot_size);
@@ -154,7 +154,7 @@ struct ltt_trace_ops {
 	void (*remove_channel) (struct ust_channel *channel);
 	void (*user_errors) (struct ltt_trace_struct *trace,
 				unsigned int index, size_t data_size,
-				struct user_dbg_data *dbg);
+				struct user_dbg_data *dbg, unsigned int cpu);
 } ____cacheline_aligned;
 
 struct ltt_transport {
@@ -279,7 +279,7 @@ struct ltt_subbuffer_header {
  * structure because gcc generates inefficient code on some architectures
  * (powerpc, mips..)
  */
-static inline size_t ltt_subbuffer_header_size(void)
+static __inline__ size_t ltt_subbuffer_header_size(void)
 {
 	return offsetof(struct ltt_subbuffer_header, header_end);
 }
@@ -303,7 +303,7 @@ static inline size_t ltt_subbuffer_header_size(void)
  * The payload must itself determine its own alignment from the biggest type it
  * contains.
  * */
-static inline unsigned char ust_get_header_size(
+static __inline__ unsigned char ust_get_header_size(
 		struct ust_channel *channel,
 		size_t offset,
 		size_t data_size,
@@ -355,7 +355,7 @@ static inline unsigned char ust_get_header_size(
  *
  * returns : offset where the event data must be written.
  */
-static inline size_t ltt_write_event_header(struct ltt_trace_struct *trace,
+static __inline__ size_t ltt_write_event_header(struct ltt_trace_struct *trace,
 		struct ust_buffer *buf, long buf_offset,
 		u16 eID, size_t event_size,
 		u64 tsc, unsigned int rflags)
@@ -448,7 +448,7 @@ static inline size_t ltt_write_event_header(struct ltt_trace_struct *trace,
  *
  * Return : -ENOSPC if not enough space, else 0.
  */
-static inline int ltt_reserve_slot(
+static __inline__ int ltt_reserve_slot(
 		struct ltt_trace_struct *trace,
 		struct ust_channel *channel,
 		void **transport_data,
@@ -457,11 +457,11 @@ static inline int ltt_reserve_slot(
 		long *buf_offset,
 		u64 *tsc,
 		unsigned int *rflags,
-		int largest_align)
+		int largest_align, int cpu)
 {
 	return trace->ops->reserve_slot(trace, channel, transport_data,
 			data_size, slot_size, buf_offset, tsc, rflags,
-			largest_align);
+			largest_align, cpu);
 }