summaryrefslogtreecommitdiffstats
path: root/kernel/itimer.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-03 21:46:06 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-03 21:46:06 +0000
commit3e414096429d55fbc8116171bba3487647bbe638 (patch)
tree2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /kernel/itimer.c
parent20b23bfcf36fcb2d16d8b844501072541970637c (diff)
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'kernel/itimer.c')
-rw-r--r--kernel/itimer.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c
index 6c38477be..79d58220c 100644
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -103,7 +103,6 @@ void it_real_fn(unsigned long __data)
p->real_timer.expires = jiffies + interval;
add_timer(&p->real_timer);
}
- timer_exit(&p->real_timer);
}
int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)