aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-20 14:38:21 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-20 14:38:21 -0400
commitf1f9b3b1795da8625e0e6096813c9d18d4a344ce (patch)
tree5b5b8a9bc5e8b92962708282484a01d86a2027e2
parent125e702b09a28a502e145fb434678ee27720fc48 (diff)
perfcounters, sched: remove __task_delta_exec()
This function was left orphan by the latest round of sw-counter cleanups. [ Impact: remove unused kernel function ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/kernel_stat.h1
-rw-r--r--kernel/sched.c23
2 files changed, 0 insertions, 24 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
index 080d1fd461d7..a77c6007dc99 100644
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@ -85,7 +85,6 @@ static inline unsigned int kstat_irqs(unsigned int irq)
85/* 85/*
86 * Lock/unlock the current runqueue - to extract task statistics: 86 * Lock/unlock the current runqueue - to extract task statistics:
87 */ 87 */
88extern unsigned long long __task_delta_exec(struct task_struct *tsk, int update);
89extern unsigned long long task_delta_exec(struct task_struct *); 88extern unsigned long long task_delta_exec(struct task_struct *);
90 89
91extern void account_user_time(struct task_struct *, cputime_t, cputime_t); 90extern void account_user_time(struct task_struct *, cputime_t, cputime_t);
diff --git a/kernel/sched.c b/kernel/sched.c
index b66a08c2480e..a69278eef425 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4550,29 +4550,6 @@ EXPORT_PER_CPU_SYMBOL(kstat);
4550 * Return any ns on the sched_clock that have not yet been banked in 4550 * Return any ns on the sched_clock that have not yet been banked in
4551 * @p in case that task is currently running. 4551 * @p in case that task is currently running.
4552 */ 4552 */
4553unsigned long long __task_delta_exec(struct task_struct *p, int update)
4554{
4555 s64 delta_exec;
4556 struct rq *rq;
4557
4558 rq = task_rq(p);
4559 WARN_ON_ONCE(!runqueue_is_locked());
4560 WARN_ON_ONCE(!task_current(rq, p));
4561
4562 if (update)
4563 update_rq_clock(rq);
4564
4565 delta_exec = rq->clock - p->se.exec_start;
4566
4567 WARN_ON_ONCE(delta_exec < 0);
4568
4569 return delta_exec;
4570}
4571
4572/*
4573 * Return any ns on the sched_clock that have not yet been banked in
4574 * @p in case that task is currently running.
4575 */
4576unsigned long long task_delta_exec(struct task_struct *p) 4553unsigned long long task_delta_exec(struct task_struct *p)
4577{ 4554{
4578 unsigned long flags; 4555 unsigned long flags;