diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2007-03-01 15:00:58 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2007-03-01 15:00:58 +0000 |
| commit | b733257b88a91c6c9611e87c72830a62277283bf (patch) | |
| tree | 5de007db97b8f6e4cfd94aa59919cf8a3360276e | |
| parent | f812617893843af16cf18a7960020682a82db069 (diff) | |
proper softint treatment (that get missed otherwise); found and tested by mpf@ on pppoe; drahn@ ok
| -rw-r--r-- | sys/arch/macppc/dev/macintr.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/openpic.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c index 322c8c11d05..0d3848b5dde 100644 --- a/sys/arch/macppc/dev/macintr.c +++ b/sys/arch/macppc/dev/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.30 2006/03/12 02:49:50 brad Exp $ */ +/* $OpenBSD: macintr.c,v 1.31 2007/03/01 15:00:57 mickey Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -589,7 +589,7 @@ mac_intr_do_pending_int() ipending &= ~SINT_TTY; softtty(); } - } while (ipending & (SINT_NET|SINT_CLOCK|SINT_TTY) & ~cpl); + } while (ipending & (SINT_NET|SINT_CLOCK|SINT_TTY) & ~pcpl); ipending &= pcpl; cpl = pcpl; /* Don't use splx... we are here already! */ ppc_intr_enable(s); diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c index fbac0e07a9d..95d73abdd3b 100644 --- a/sys/arch/macppc/dev/openpic.c +++ b/sys/arch/macppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.35 2006/06/19 22:42:33 miod Exp $ */ +/* $OpenBSD: openpic.c,v 1.36 2007/03/01 15:00:57 mickey Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -503,7 +503,7 @@ openpic_do_pending_int() ipending &= ~SINT_TTY; softtty(); } - } while (ipending & (SINT_NET|SINT_CLOCK|SINT_TTY) & ~cpl); + } while (ipending & (SINT_NET|SINT_CLOCK|SINT_TTY) & ~pcpl); ipending &= pcpl; cpl = pcpl; /* Don't use splx... we are here already! */ ppc_intr_enable(s); |