diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 17d956cebcb9..13fa72cac7d8 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -956,19 +956,7 @@ void do_timer(struct pt_regs *regs) | |||
956 | */ | 956 | */ |
957 | asmlinkage unsigned long sys_alarm(unsigned int seconds) | 957 | asmlinkage unsigned long sys_alarm(unsigned int seconds) |
958 | { | 958 | { |
959 | struct itimerval it_new, it_old; | 959 | return alarm_setitimer(seconds); |
960 | unsigned int oldalarm; | ||
961 | |||
962 | it_new.it_interval.tv_sec = it_new.it_interval.tv_usec = 0; | ||
963 | it_new.it_value.tv_sec = seconds; | ||
964 | it_new.it_value.tv_usec = 0; | ||
965 | do_setitimer(ITIMER_REAL, &it_new, &it_old); | ||
966 | oldalarm = it_old.it_value.tv_sec; | ||
967 | /* ehhh.. We can't return 0 if we have an alarm pending.. */ | ||
968 | /* And we'd better return too much than too little anyway */ | ||
969 | if ((!oldalarm && it_old.it_value.tv_usec) || it_old.it_value.tv_usec >= 500000) | ||
970 | oldalarm++; | ||
971 | return oldalarm; | ||
972 | } | 960 | } |
973 | 961 | ||
974 | #endif | 962 | #endif |