summaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-10 05:27:25 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-10 05:27:25 +0000
commitc9c06167e7933d93a6e396174c68abf242294abb (patch)
treed9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /kernel/timer.c
parentf79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff)
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index e67783a30..579b065f3 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -39,7 +39,6 @@ int tickadj = 500/HZ ? : 1; /* microsecs */
DECLARE_TASK_QUEUE(tq_timer);
DECLARE_TASK_QUEUE(tq_immediate);
-DECLARE_TASK_QUEUE(tq_scheduler);
/*
* phase-lock loop variables
@@ -681,7 +680,7 @@ void do_timer(struct pt_regs *regs)
update_process_times(user_mode(regs));
#endif
mark_bh(TIMER_BH);
- if (tq_timer)
+ if (TQ_ACTIVE(tq_timer))
mark_bh(TQUEUE_BH);
}