diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-02-03 17:49:49 -0500 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-02-03 17:49:49 -0500 |
| commit | 01d206a7c1167639f6ca6dac22140fbdca017558 (patch) | |
| tree | bc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /kernel/fork.c | |
| parent | 9c4b562abc9005e4b413de02c85d3d29da707cba (diff) | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
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 | |||
| 802 | init_sigpending(&sig->shared_pending); | 802 | init_sigpending(&sig->shared_pending); |
| 803 | INIT_LIST_HEAD(&sig->posix_timers); | 803 | INIT_LIST_HEAD(&sig->posix_timers); |
| 804 | 804 | ||
| 805 | hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC); | 805 | hrtimer_init(&sig->real_timer, CLOCK_MONOTONIC, HRTIMER_REL); |
| 806 | sig->it_real_incr.tv64 = 0; | 806 | sig->it_real_incr.tv64 = 0; |
| 807 | sig->real_timer.function = it_real_fn; | 807 | sig->real_timer.function = it_real_fn; |
| 808 | sig->real_timer.data = tsk; | 808 | sig->real_timer.data = tsk; |