summaryrefslogtreecommitdiff
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@earth2.(none)>2002-02-11 22:47:52 +0100
committerIngo Molnar <mingo@earth2.(none)>2002-02-11 22:47:52 +0100
commit7e54bc75751cfb3c3eb5da7bdc900b8adcc2cda4 (patch)
treee7c1f9f373f4ede645ebf963a0448acb70a512f8 /kernel/timer.c
parent14d39718ea2be95cc7197c8c94bf56142d0a306c (diff)
merge to the -K3 scheduler.
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index da17ae4acdd8..6b79d2045882 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -584,17 +584,7 @@ void update_process_times(int user_tick)
int cpu = smp_processor_id(), system = user_tick ^ 1;
update_one_process(p, user_tick, system, cpu);
- if (p->pid) {
- 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 {
- if (local_bh_count(cpu) || local_irq_count(cpu) > 1)
- kstat.per_cpu_system[cpu] += system;
- }
- scheduler_tick(p);
+ scheduler_tick(user_tick, system);
}
/*