PERFORCE change 42390 for review
Peter Wemm
peter at FreeBSD.org
Fri Nov 14 14:06:25 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=42390
Change 42390 by peter at peter_daintree on 2003/11/14 14:06:09
integ -I -b smp_hammer
Affected files ...
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#10 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#13 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#25 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#7 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#10 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.2 2003/11/12 18:13:57 jhb Exp $
+ * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.3 2003/11/14 21:00:32 jhb Exp $
*/
/*
@@ -171,7 +171,10 @@
atomic_add_int(&cnt.v_intr, 1);
it = isrc->is_ithread;
- ih = TAILQ_FIRST(&it->it_handlers);
+ if (it == NULL)
+ ih = NULL;
+ else
+ ih = TAILQ_FIRST(&it->it_handlers);
/*
* XXX: We assume that IRQ 0 is only used for the ISA timer
==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.225 2003/11/11 21:19:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.226 2003/11/14 20:51:07 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/isa/atpic.c#25 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.4 2003/11/14 19:13:06 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.5 2003/11/14 21:02:49 jhb Exp $");
#include "opt_auto_eoi.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#7 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.39 2003/11/12 18:13:57 jhb Exp $
+ * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.40 2003/11/14 20:06:24 peter Exp $
*/
/*
More information about the p4-projects
mailing list