From 468e6d17ff42e6f291a88c87681b2b5e34e9ab33 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 5 Feb 2002 00:13:46 -0800 Subject: 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 --- kernel/timer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/timer.c') 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); } /* -- cgit v1.2.3