From 157842c2e9dc7bb794ebaa84ef1c39037d15cc54 Mon Sep 17 00:00:00 2001 From: Glenn Elliott Date: Thu, 28 Mar 2013 19:17:02 -0400 Subject: resolve kshark rebase conflicts --- include/litmus/sched_trace.h | 1 - include/trace/ftrace.h | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h index 9a7e6fa1e6b6..bc86f184be2c 100644 --- a/include/litmus/sched_trace.h +++ b/include/litmus/sched_trace.h @@ -435,7 +435,6 @@ feather_callback void do_sched_trace_lock(unsigned long id, SCHED_TRACE3(SCHED_TRACE_BASE_ID + 21, do_sched_trace_lock, t, lock_id, acquired) - #define sched_trace_quantum_boundary() /* NOT IMPLEMENTED */ #endif /* __KERNEL__ */ diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 533c49f48047..4d6f3474e8fa 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -17,6 +17,7 @@ */ #include +#include /* * DECLARE_EVENT_CLASS can be used to add a generic function @@ -54,7 +55,7 @@ #define __string(item, src) __dynamic_array(char, item, -1) #undef TP_STRUCT__entry -#define TP_STRUCT__entry(args...) args +#define TP_STRUCT__entry(args...) args __field( unsigned long long, __rt_ts ) #undef DECLARE_EVENT_CLASS #define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print) \ @@ -507,7 +508,7 @@ static inline notrace int ftrace_get_offsets_##call( \ strcpy(__get_str(dst), src); #undef TP_fast_assign -#define TP_fast_assign(args...) args +#define TP_fast_assign(args...) args; __entry->__rt_ts = litmus_clock(); #undef TP_perf_assign #define TP_perf_assign(args...) -- cgit v1.2.2