From owner-cvs-src@FreeBSD.ORG Wed Nov 14 05:43:56 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 137E416A417; Wed, 14 Nov 2007 05:43:56 +0000 (UTC) (envelope-from julian@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09FDB13C467; Wed, 14 Nov 2007 05:43:56 +0000 (UTC) (envelope-from julian@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAE5hteh020824; Wed, 14 Nov 2007 05:43:55 GMT (envelope-from julian@repoman.freebsd.org) Received: (from julian@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAE5ht3O020823; Wed, 14 Nov 2007 05:43:55 GMT (envelope-from julian) Message-Id: <200711140543.lAE5ht3O020823@repoman.freebsd.org> From: Julian Elischer Date: Wed, 14 Nov 2007 05:43:55 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/i386/bios apm.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2007 05:43:56 -0000 julian 2007-11-14 05:43:55 UTC FreeBSD src repository Modified files: sys/i386/bios apm.c Log: Apply the same sort of locking done in sys/dev/acpica/acpi.c rev 1.196 a while ago: Grab Giant around calls to DEVICE_SUSPEND/RESUME in acpi_SetSleepState(). If we are resuming non-MPSAFE drivers, they need Giant held for them. This may fix some obscure suspend/resume problems. It has fixed keyrate setting problems that were triggered by cardbus (MPSAFE) changing the ordering for syscons resume (non-MPSAFE). Also, add some asserts that Giant is held in our suspend/resume and shutdown methods. Submitted by: Marko Zec Revision Changes Path 1.149 +10 -0 src/sys/i386/bios/apm.c