diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:54 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:54 +0000 |
| commit | 35442183351c76bca81db6ef96104c65c42a46ca (patch) | |
| tree | d6bba3c6fb321e49cfdb1c8b995f473c49306fa2 /sys/i386/linux/linux_misc.c | |
| parent | 2ee1f005b03c9cdd88017df5058d36c60924ad24 (diff) | |
Notes
Diffstat (limited to 'sys/i386/linux/linux_misc.c')
| -rw-r--r-- | sys/i386/linux/linux_misc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index 42e3a7df240c..723732b0fe28 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_misc.c,v 1.28 1997/04/28 02:53:17 msmith Exp $ + * $Id: linux_misc.c,v 1.29 1997/07/20 16:06:01 bde Exp $ */ #include <sys/param.h> @@ -82,11 +82,12 @@ linux_alarm(struct proc *p, struct linux_alarm_args *args, int *retval) if (itimerfix(&it.it_value) || itimerfix(&it.it_interval)) return EINVAL; s = splclock(); - untimeout(realitexpire, (caddr_t)p); + if (timerisset(&p->p_realtimer.it_value)) + untimeout(realitexpire, (caddr_t)p, p->p_ithandle); tv = time; if (timerisset(&it.it_value)) { timevaladd(&it.it_value, &tv); - timeout(realitexpire, (caddr_t)p, hzto(&it.it_value)); + p->p_ithandle = timeout(realitexpire, (caddr_t)p, hzto(&it.it_value)); } p->p_realtimer = it; splx(s); |