diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-25 07:28:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-09-25 07:28:05 -0700 |
| commit | 2ce067b09aff22fcfe57e805e5abf409d4547dd1 (patch) | |
| tree | c73baa99b8cedcccfc6f2cd14a006f94160175e3 /kernel/timer.c | |
| parent | 56d8b39d50e64ca5f9e20cfcd79870dd4109974f (diff) | |
| parent | 4ab1a3e6a2904f6265c20ad0b1144092bbd2529a (diff) | |
Merge bk://ldm.bkbits.net/linux-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 3b4be840f931..55c14c11c901 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -888,20 +888,6 @@ asmlinkage long sys_nanosleep(struct timespec *rqtp, struct timespec *rmtp) if (t.tv_nsec >= 1000000000L || t.tv_nsec < 0 || t.tv_sec < 0) return -EINVAL; - - if (t.tv_sec == 0 && t.tv_nsec <= 2000000L && - current->policy != SCHED_NORMAL) - { - /* - * Short delay requests up to 2 ms will be handled with - * high precision by a busy wait for all real-time processes. - * - * Its important on SMP not to do this holding locks. - */ - udelay((t.tv_nsec + 999) / 1000); - return 0; - } - expire = timespec_to_jiffies(&t) + (t.tv_sec || t.tv_nsec); current->state = TASK_INTERRUPTIBLE; |