From owner-cvs-src@FreeBSD.ORG Mon Jul 21 13:59:29 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B406C37B405; Mon, 21 Jul 2003 13:59:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E20C43FBF; Mon, 21 Jul 2003 13:59:29 -0700 (PDT) (envelope-from peter@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6LKxS0U064228; Mon, 21 Jul 2003 13:59:28 -0700 (PDT) (envelope-from peter@repoman.freebsd.org) Received: (from peter@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6LKxS9Z064227; Mon, 21 Jul 2003 13:59:28 -0700 (PDT) Message-Id: <200307212059.h6LKxS9Z064227@repoman.freebsd.org> From: Peter Wemm Date: Mon, 21 Jul 2003 13:59:28 -0700 (PDT) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/i386/acpica acpi_wakeup.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 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: Mon, 21 Jul 2003 20:59:30 -0000 peter 2003/07/21 13:59:28 PDT FreeBSD src repository Modified files: sys/i386/acpica acpi_wakeup.c Log: Commit Ian Dowse's workaround for acpi resume resetting after the LAZY_SWITCH changes. He pointed out the acpi code sets up an identity mapping in the current vmspace and that got messed up by the %cr3 being out of sync with the current page directory. As a workaround, restore %cr3 across the sleep/resume. A more complete fix would be to undo the lazy state and clear the pm_active bit from the borrowed pmap, but this works and people are currently hurting. I'll clean this up. This is mostly Ian's patch, plus a PAE tweak from me. Revision Changes Path 1.22 +8 -0 src/sys/i386/acpica/acpi_wakeup.c