Date: Thu, 29 Oct 2009 15:13:51 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r198597 - in stable/7/sys: . contrib/pf dev/acpi_support Message-ID: <200910291513.n9TFDpk8000681@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Thu Oct 29 15:13:50 2009 New Revision: 198597 URL: http://svn.freebsd.org/changeset/base/198597 Log: MFC 197460: Remove unnecessary locking from attach(). This fixes a LOR between the acpi_ibm lock and the sysctl lock. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/acpi_support/acpi_ibm.c Modified: stable/7/sys/dev/acpi_support/acpi_ibm.c ============================================================================== --- stable/7/sys/dev/acpi_support/acpi_ibm.c Thu Oct 29 15:13:36 2009 (r198596) +++ stable/7/sys/dev/acpi_support/acpi_ibm.c Thu Oct 29 15:13:50 2009 (r198597) @@ -356,8 +356,6 @@ acpi_ibm_attach(device_t dev) } sc->ec_handle = acpi_get_handle(sc->ec_dev); - ACPI_SERIAL_BEGIN(ibm); - /* Get the sysctl tree */ sc->sysctl_ctx = device_get_sysctl_ctx(dev); sc->sysctl_tree = device_get_sysctl_tree(dev); @@ -404,8 +402,6 @@ acpi_ibm_attach(device_t dev) "Thermal zones"); } - ACPI_SERIAL_END(ibm); - /* Handle notifies */ AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_ibm_notify, dev);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910291513.n9TFDpk8000681>