From 25d6f89a5956a1e8108b49f7f5f67b7237e6d7a1 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Wed, 19 Feb 2003 11:23:53 +0000 Subject: [PATCH] update emul alarm syscalls to recent timer changes problem encountered by Luke Mewburn for linux emul, problem spot found by Enami Tsugutomo --- sys/compat/hpux/hpux_compat.c | 7 +++++-- sys/compat/linux/common/linux_misc_notalpha.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c index 71160a556b6d..ab92225cf7d7 100644 --- a/sys/compat/hpux/hpux_compat.c +++ b/sys/compat/hpux/hpux_compat.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_compat.c,v 1.61 2003/01/18 07:36:56 thorpej Exp $ */ +/* $NetBSD: hpux_compat.c,v 1.62 2003/02/19 11:23:53 jdolecek Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -47,7 +47,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hpux_compat.c,v 1.61 2003/01/18 07:36:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_compat.c,v 1.62 2003/02/19 11:23:53 jdolecek Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -1245,7 +1245,10 @@ hpux_sys_alarm_6x(l, v, retval) ptp = pool_get(&ptimer_pool, PR_WAITOK); ptp->pt_ev.sigev_notify = SIGEV_SIGNAL; ptp->pt_ev.sigev_signo = SIGALRM; + ptp->pt_overruns = 0; + ptp->pt_proc = p; ptp->pt_type = CLOCK_REALTIME; + ptp->pt_entry = CLOCK_REALTIME; p->p_timers->pts_timers[ITIMER_REAL] = ptp; callout_init(&ptp->pt_ch); } diff --git a/sys/compat/linux/common/linux_misc_notalpha.c b/sys/compat/linux/common/linux_misc_notalpha.c index b20c08a638d1..606d8035be96 100644 --- a/sys/compat/linux/common/linux_misc_notalpha.c +++ b/sys/compat/linux/common/linux_misc_notalpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_misc_notalpha.c,v 1.64 2003/01/18 08:02:54 thorpej Exp $ */ +/* $NetBSD: linux_misc_notalpha.c,v 1.65 2003/02/19 11:23:54 jdolecek Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.64 2003/01/18 08:02:54 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.65 2003/02/19 11:23:54 jdolecek Exp $"); #include #include @@ -145,7 +145,10 @@ linux_sys_alarm(l, v, retval) ptp = pool_get(&ptimer_pool, PR_WAITOK); ptp->pt_ev.sigev_notify = SIGEV_SIGNAL; ptp->pt_ev.sigev_signo = SIGALRM; + ptp->pt_overruns = 0; + ptp->pt_proc = p; ptp->pt_type = CLOCK_REALTIME; + ptp->pt_entry = CLOCK_REALTIME; callout_init(&ptp->pt_ch); }