---

yaml --- r: 147486 b: refs/heads/master c: e220d2d h: refs/heads/master v: v3
git-mirror · May 23, 2009 · 38c8489 · 38c8489
1 parent cf33f42
commit 38c8489
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6eb13847ba081552d2af644219bddeff7110caf
+refs/heads/master: e220d2dcb944c5c488b6855d15ec66d76900514f
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
@@ -260,6 +260,7 @@ enum perf_event_type {
 	/*
 	 * struct {
 	 * 	struct perf_event_header	header;
+	 * 	u64				time;
 	 * 	u64				irq_period;
 	 * };
 	 */

diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -2559,7 +2559,8 @@ void perf_counter_munmap(unsigned long addr, unsigned long len,
 }
 
 /*
- *
+ * Log irq_period changes so that analyzing tools can re-normalize the
+ * event flow.
  */
 
 static void perf_log_period(struct perf_counter *counter, u64 period)

diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4875,9 +4875,10 @@ void scheduler_tick(void)
 	update_rq_clock(rq);
 	update_cpu_load(rq);
 	curr->sched_class->task_tick(rq, curr, 0);
-	perf_counter_task_tick(curr, cpu);
 	spin_unlock(&rq->lock);
 
+	perf_counter_task_tick(curr, cpu);
+
 #ifdef CONFIG_SMP
 	rq->idle_at_tick = idle_cpu(cpu);
 	trigger_load_balance(rq, cpu);
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     /*
-     *
+     * Log irq_period changes so that analyzing tools can re-normalize the
+     * event flow.
      */
     static void perf_log_period(struct perf_counter *counter, u64 period)
@@ Expand Down @@