diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:13:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:13:46 -0800 |
| commit | 468e6d17ff42e6f291a88c87681b2b5e34e9ab33 (patch) | |
| tree | 2877d59eef8cc3a59cc647c4daf50dabea3f065a /kernel/timer.c | |
| parent | d694597ed5e1f6613d0933ee692333ab2542b603 (diff) | |
v2.5.2.1 -> v2.5.2.1.1
- David Howells: abtract out "current->need_resched" as "need_resched()"
- Frank Davis: ide-tape update for bio
- various: header file fixups
- Jens Axboe: fix up bio/ide/highmem issues
- Kai Germaschewski: ISDN update
- Tim Waugh: parport update
- Patrik Mochel: initcall update
- Greg KH: USB and Compaq PCI hotplug updates
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index ce3945cda799..da17ae4acdd8 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -585,17 +585,16 @@ void update_process_times(int user_tick) update_one_process(p, user_tick, system, cpu); if (p->pid) { - expire_task(p); if (p->__nice > 0) kstat.per_cpu_nice[cpu] += user_tick; else kstat.per_cpu_user[cpu] += user_tick; kstat.per_cpu_system[cpu] += system; } else { - idle_tick(); if (local_bh_count(cpu) || local_irq_count(cpu) > 1) kstat.per_cpu_system[cpu] += system; } + scheduler_tick(p); } /* |