Merge branch 'wip-semi-part' of ssh://cvs/cvs/proj/litmus/repo/litmus2010 into wip-semi-partarchived-semi-part

2 files changed, 5 insertions, 0 deletions

diff --git a/include/litmus/trace.h b/include/litmus/trace.h
index b32c71180774..6afbf96ef9e4 100644
--- a/include/litmus/trace.h
+++ b/include/litmus/trace.h
@@ -78,6 +78,8 @@ feather_callback void save_timestamp_cpu(unsigned long event, unsigned long cpu)
 #define TS_TICK_START(t)                TTIMESTAMP(110, t)
 #define TS_TICK_END(t)                  TTIMESTAMP(111, t)
 
+#define TS_PULL_TIMER_START             TIMESTAMP(112)
+#define TS_PULL_TIMER_END               TIMESTAMP(113)
 
 #define TS_PLUGIN_SCHED_START           /* TIMESTAMP(120) */  /* currently unused */
 #define TS_PLUGIN_SCHED_END             /* TIMESTAMP(121) */
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index fdf95968e517..23d3712012f4 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -47,6 +47,7 @@
 #include <linux/timer.h>
 
 #include <litmus/litmus.h>
+#include <litmus/trace.h>
 
 #include <asm/uaccess.h>
 
@@ -1063,6 +1064,7 @@ void hrtimer_pull(void)
         struct hrtimer_start_on_info *info;
         struct list_head *pos, *safe, list;
 
+        TS_PULL_TIMER_START;
         raw_spin_lock(&base->lock);
         list_replace_init(&base->to_pull, &list);
         raw_spin_unlock(&base->lock);
@@ -1073,6 +1075,7 @@ void hrtimer_pull(void)
                 list_del(pos);
                 hrtimer_start(info->timer, info->time, info->mode);
         }
+        TS_PULL_TIMER_END;
 }
 
 /**