diff options
| author | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:54 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1997-09-21 21:43:54 +0000 |
| commit | 3579df4d35e102051246eb21aa0d7712fbfb6544 (patch) | |
| tree | 8d1f4c2b2e369e3fe2c31dd6990d82ab0ca66efb /sys/compat/linux/linux_misc.c | |
| parent | d281074565525b1dfa00c6fad20aa0005b0a7867 (diff) | |
| download | FreeBSD-src-3579df4d35e102051246eb21aa0d7712fbfb6544.zip FreeBSD-src-3579df4d35e102051246eb21aa0d7712fbfb6544.tar.gz | |
Update for changes in the callout interface.
Diffstat (limited to 'sys/compat/linux/linux_misc.c')
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 42e3a7d..723732b 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/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); |
