summaryrefslogtreecommitdiff
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-11-07 20:11:44 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2003-11-07 20:11:44 -0800
commit35d64a3345463ace22f42ca6ca993b84e1d5f1e9 (patch)
tree1d38f45655574505061f9bfcf1bf8d2bb738fce8 /kernel/timer.c
parent59ccfc460a322aa9522a259572258a5fffbd4bcc (diff)
Don't fold nanosleep() into clock_nanosleep().
The latter has buggy restart functionality and is a lot more complicated anyway.
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index a8442b38659b..a9c8c1958b6a 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1059,7 +1059,6 @@ asmlinkage long sys_gettid(void)
{
return current->pid;
}
-#ifndef FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP
static long nanosleep_restart(struct restart_block *restart)
{
@@ -1118,7 +1117,6 @@ asmlinkage long sys_nanosleep(struct timespec *rqtp, struct timespec *rmtp)
}
return ret;
}
-#endif // ! FOLD_NANO_SLEEP_INTO_CLOCK_NANO_SLEEP
/*
* sys_sysinfo - fill in sysinfo struct