Module Name: src Committed By: riz Date: Mon Dec 10 18:26:01 UTC 2012
Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.1 src/sys/dev/acpi [netbsd-6-0]: acpi_pci_link.c Log Message: Back out ticket #682; it's causing some systems to fail to boot. To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/doc/CHANGES-6.0.1 cvs rdiff -u -r1.18.20.1 -r1.18.20.2 src/sys/dev/acpi/acpi_pci_link.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/doc/CHANGES-6.0.1 diff -u src/doc/CHANGES-6.0.1:1.1.2.26 src/doc/CHANGES-6.0.1:1.1.2.27 --- src/doc/CHANGES-6.0.1:1.1.2.26 Fri Nov 30 06:32:31 2012 +++ src/doc/CHANGES-6.0.1 Mon Dec 10 18:26:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.1,v 1.1.2.26 2012/11/30 06:32:31 msaitoh Exp $ +# $NetBSD: CHANGES-6.0.1,v 1.1.2.27 2012/12/10 18:26:01 riz Exp $ A complete list of changes from the NetBSD 6.0 release to the NetBSD 6.0.1 release: @@ -146,11 +146,6 @@ share/zoneinfo/southamerica patch Various fixes to documentation and commentary. [apb, ticket #677] -sys/dev/acpi/acpi_pci_link.c 1.19 - - Fix PCI interrupts on some systems. - [chs, ticket #682] - sys/dev/ic/ciss.c 1.28 ciss(4): don't try to handle sensors if there aren't any. Index: src/sys/dev/acpi/acpi_pci_link.c diff -u src/sys/dev/acpi/acpi_pci_link.c:1.18.20.1 src/sys/dev/acpi/acpi_pci_link.c:1.18.20.2 --- src/sys/dev/acpi/acpi_pci_link.c:1.18.20.1 Thu Nov 22 00:34:44 2012 +++ src/sys/dev/acpi/acpi_pci_link.c Mon Dec 10 18:26:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $ */ +/* $NetBSD: acpi_pci_link.c,v 1.18.20.2 2012/12/10 18:26:01 riz Exp $ */ /*- * Copyright (c) 2002 Mitsuru IWASAKI <iwas...@jp.freebsd.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18.20.2 2012/12/10 18:26:01 riz Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -533,11 +533,13 @@ acpi_pci_link_attach(struct acpi_pci_lin * run _DIS (i.e., the method doesn't exist), assume the initial * IRQ was routed by the BIOS. */ +#if 0 /* XXX causes spontaneaous resets on some systems. Disabled for now. */ if (ACPI_SUCCESS(AcpiEvaluateObject(sc->pl_handle, "_DIS", NULL, NULL))) for (i = 0; i < sc->pl_num_links; i++) sc->pl_links[i].l_irq = PCI_INVALID_IRQ; else +#endif for (i = 0; i < sc->pl_num_links; i++) if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq)) sc->pl_links[i].l_routed = TRUE;