svn commit: r209456 - head/sys/x86/isa

Alexander Motin mav at FreeBSD.org
Wed Jun 23 05:43:22 UTC 2010


Author: mav
Date: Wed Jun 23 05:43:21 2010
New Revision: 209456
URL: http://svn.freebsd.org/changeset/base/209456

Log:
  Do not trust IRQ reported by ACPI. There are cases when it is wrong.

Modified:
  head/sys/x86/isa/atrtc.c
  head/sys/x86/isa/clock.c

Modified: head/sys/x86/isa/atrtc.c
==============================================================================
--- head/sys/x86/isa/atrtc.c	Wed Jun 23 04:42:47 2010	(r209455)
+++ head/sys/x86/isa/atrtc.c	Wed Jun 23 05:43:21 2010	(r209456)
@@ -259,6 +259,7 @@ atrtc_attach(device_t dev)
 	if (!atrtcclock_disable &&
 	    (resource_int_value(device_get_name(dev), device_get_unit(dev),
 	     "clock", &i) != 0 || i != 0)) {
+	    	sc->intr_rid = -1;
 		if (!(sc->intr_res = bus_alloc_resource(dev, SYS_RES_IRQ,
 		    &sc->intr_rid, 8, 8, 1, RF_ACTIVE))) {
 			device_printf(dev,"Can't map interrupt.\n");

Modified: head/sys/x86/isa/clock.c
==============================================================================
--- head/sys/x86/isa/clock.c	Wed Jun 23 04:42:47 2010	(r209455)
+++ head/sys/x86/isa/clock.c	Wed Jun 23 05:43:21 2010	(r209456)
@@ -535,6 +535,7 @@ attimer_attach(device_t dev)
 	tc_init(&sc->tc);
 	if (resource_int_value(device_get_name(dev), device_get_unit(dev),
 	    "clock", &i) != 0 || i != 0) {
+	    	sc->intr_rid = -1;
 		if (!(sc->intr_res = bus_alloc_resource(dev, SYS_RES_IRQ,
 		    &sc->intr_rid, 0, 0, 1, RF_ACTIVE))) {
 			device_printf(dev,"Can't map interrupt.\n");


More information about the svn-src-head mailing list