diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 11:15:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 11:15:27 -0700 |
commit | 370504cf7c68b953de55c41d5e0be97d30f3cf00 (patch) | |
tree | 1941a38f78083dca4852070c229363d81bbb9aae /kernel/sched_rt.c | |
parent | 160d6aaf60d75b71a48223b5bdc29285e18cff07 (diff) | |
parent | 94c18227d1e3f02de5b345bd3cd5c960214dc9c8 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
[PATCH] sched: reduce task_struct size
[PATCH] sched: reduce debug code
[PATCH] sched: use schedstat_set() API
[PATCH] sched: add schedstat_set() API
[PATCH] sched: move load-calculation functions
[PATCH] sched: ->task_new cleanup
[PATCH] sched: uninline inc/dec_nr_running()
[PATCH] sched: uninline calc_delta_mine()
[PATCH] sched: calc_delta_mine(): use fixed limit
[PATCH] sched: tidy up left over smpnice code
[PATCH] sched: remove cache_hot_time
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r-- | kernel/sched_rt.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 1192a2741b9..002fcf8d3f6 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c @@ -18,8 +18,8 @@ static inline void update_curr_rt(struct rq *rq, u64 now) delta_exec = now - curr->se.exec_start; if (unlikely((s64)delta_exec < 0)) delta_exec = 0; - if (unlikely(delta_exec > curr->se.exec_max)) - curr->se.exec_max = delta_exec; + + schedstat_set(curr->se.exec_max, max(curr->se.exec_max, delta_exec)); curr->se.sum_exec_runtime += delta_exec; curr->se.exec_start = now; @@ -229,15 +229,6 @@ static void task_tick_rt(struct rq *rq, struct task_struct *p) requeue_task_rt(rq, p); } -/* - * No parent/child timeslice management necessary for RT tasks, - * just activate them: - */ -static void task_new_rt(struct rq *rq, struct task_struct *p) -{ - activate_task(rq, p, 1); -} - static struct sched_class rt_sched_class __read_mostly = { .enqueue_task = enqueue_task_rt, .dequeue_task = dequeue_task_rt, @@ -251,5 +242,4 @@ static struct sched_class rt_sched_class __read_mostly = { .load_balance = load_balance_rt, .task_tick = task_tick_rt, - .task_new = task_new_rt, }; |