summaryrefslogtreecommitdiffstats
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorGeorge Anzinger2006-02-01 12:05:11 +0100
committerLinus Torvalds2006-02-01 17:53:13 +0100
commit7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0 (patch)
treea7deb3a6e339e691078c770d4b9cbc05d99a2243 /kernel/fork.c
parent[PATCH] hrtimers: fix posix-timer requeue race (diff)
downloadkernel-qcow2-linux-7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0.tar.gz
kernel-qcow2-linux-7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0.tar.xz
kernel-qcow2-linux-7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0.zip
[PATCH] hrtimers: cleanups and simplifications
Clean up the interface to hrtimers by changing the init code to pass the mode as well as the clock. This allow the init code to select the correct base and eliminates extra timer re-init code in posix-timers. We also simplify the restart interface nanosleep use. Signed-off-by: George Anzinger <george@mvista.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 4ae8cfc1c89c..7f0ab5ee948c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -802,7 +802,7 @@ static inline int copy_signal(unsigned long clone_flags, struct task_struct * ts
init_sigpending(&sig->shared_pending);
INIT_LIST_HEAD(&sig->posix_timers);
- hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC);
+ hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_REL);
sig->it_real_incr.tv64 = 0;
sig->real_timer.function = it_real_fn;
sig->real_timer.data = tsk;