Module Name: src
Committed By: jakllsch
Date: Mon Jan 30 16:44:23 UTC 2012
Modified Files:
src/sys/arch/x86/x86: ioapic.c
Log Message:
Mask all i8259 interrupts in ioapic_enable().
Should fix PR kern/45160.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/ioapic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.45 src/sys/arch/x86/x86/ioapic.c:1.46
--- src/sys/arch/x86/x86/ioapic.c:1.45 Tue Apr 5 13:43:33 2011
+++ src/sys/arch/x86/x86/ioapic.c Mon Jan 30 16:44:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ioapic.c,v 1.45 2011/04/05 13:43:33 pgoyette Exp $ */
+/* $NetBSD: ioapic.c,v 1.46 2012/01/30 16:44:23 jakllsch Exp $ */
/*-
* Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.45 2011/04/05 13:43:33 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.46 2012/01/30 16:44:23 jakllsch Exp $");
#include "opt_ddb.h"
@@ -457,6 +457,8 @@ ioapic_enable(void)
if (ioapics == NULL)
return;
+ i8259_setmask(0xffff);
+
if (ioapics->sc_flags & IOAPIC_PICMODE) {
aprint_debug_dev(ioapics->sc_dev,
"writing to IMCR to disable pics\n");