From owner-svn-src-head@FreeBSD.ORG Sun Jun 10 02:38:52 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 677BA106564A; Sun, 10 Jun 2012 02:38:52 +0000 (UTC) (envelope-from iwasaki@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 519288FC0C; Sun, 10 Jun 2012 02:38:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5A2cqB9067793; Sun, 10 Jun 2012 02:38:52 GMT (envelope-from iwasaki@svn.freebsd.org) Received: (from iwasaki@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5A2cq4D067788; Sun, 10 Jun 2012 02:38:52 GMT (envelope-from iwasaki@svn.freebsd.org) Message-Id: <201206100238.q5A2cq4D067788@svn.freebsd.org> From: Mitsuru IWASAKI Date: Sun, 10 Jun 2012 02:38:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236830 - in head/sys: amd64/amd64 conf i386/i386 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2012 02:38:52 -0000 Author: iwasaki Date: Sun Jun 10 02:38:51 2012 New Revision: 236830 URL: http://svn.freebsd.org/changeset/base/236830 Log: Some fixes for r236772. - Remove cpuset stopped_cpus which is no longer used. - Add a short comment for cpuset suspended_cpus clearing. - Fix the un-ordered x86/acpica/acpi_wakeup.c in conf/files.amd64 and i386. Pointed-out by: attilio@ Modified: head/sys/amd64/amd64/mp_machdep.c head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/i386/i386/mp_machdep.c Modified: head/sys/amd64/amd64/mp_machdep.c ============================================================================== --- head/sys/amd64/amd64/mp_machdep.c Sun Jun 10 02:04:11 2012 (r236829) +++ head/sys/amd64/amd64/mp_machdep.c Sun Jun 10 02:38:51 2012 (r236830) @@ -1416,7 +1416,6 @@ cpususpend_handler(void) if (savectx(susppcbs[cpu])) { ctx_fpusave(susppcbs[cpu]->pcb_fpususpend); wbinvd(); - CPU_SET_ATOMIC(cpu, &stopped_cpus); CPU_SET_ATOMIC(cpu, &suspended_cpus); } else { pmap_init_pat(); @@ -1426,6 +1425,8 @@ cpususpend_handler(void) initializecpu(); PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); + + /* Indicate that we are resumed */ CPU_CLR_ATOMIC(cpu, &suspended_cpus); } @@ -1434,7 +1435,6 @@ cpususpend_handler(void) ia32_pause(); CPU_CLR_ATOMIC(cpu, &started_cpus); - CPU_CLR_ATOMIC(cpu, &stopped_cpus); /* Resume MCA and local APIC */ mca_resume(); Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Sun Jun 10 02:04:11 2012 (r236829) +++ head/sys/conf/files.amd64 Sun Jun 10 02:38:51 2012 (r236830) @@ -93,7 +93,6 @@ acpi_wakedata.h optional acpi \ no-obj no-implicit-rule before-depend \ clean "acpi_wakedata.h" # -x86/acpica/acpi_wakeup.c optional acpi amd64/amd64/amd64_mem.c optional mem #amd64/amd64/apic_vector.S standard amd64/amd64/atomic.c standard @@ -453,6 +452,7 @@ contrib/x86emu/x86emu.c optional x86bio # x86/acpica/OsdEnvironment.c optional acpi x86/acpica/acpi_apm.c optional acpi +x86/acpica/acpi_wakeup.c optional acpi x86/acpica/madt.c optional acpi x86/acpica/srat.c optional acpi x86/bios/smbios.c optional smbios Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Sun Jun 10 02:04:11 2012 (r236829) +++ head/sys/conf/files.i386 Sun Jun 10 02:38:51 2012 (r236830) @@ -381,7 +381,6 @@ acpi_wakedata.h optional acpi \ no-obj no-implicit-rule before-depend \ clean "acpi_wakedata.h" # -x86/acpica/acpi_wakeup.c optional acpi i386/bios/apm.c optional apm i386/bios/mca_machdep.c optional mca i386/bios/smapi.c optional smapi @@ -505,6 +504,7 @@ compat/x86bios/x86bios.c optional x86bio # x86/acpica/OsdEnvironment.c optional acpi x86/acpica/acpi_apm.c optional acpi +x86/acpica/acpi_wakeup.c optional acpi x86/acpica/madt.c optional acpi apic x86/acpica/srat.c optional acpi x86/bios/smbios.c optional smbios Modified: head/sys/i386/i386/mp_machdep.c ============================================================================== --- head/sys/i386/i386/mp_machdep.c Sun Jun 10 02:04:11 2012 (r236829) +++ head/sys/i386/i386/mp_machdep.c Sun Jun 10 02:38:51 2012 (r236830) @@ -1514,12 +1514,13 @@ cpususpend_handler(void) if (savectx(susppcbs[cpu])) { wbinvd(); - CPU_SET_ATOMIC(cpu, &stopped_cpus); CPU_SET_ATOMIC(cpu, &suspended_cpus); } else { pmap_init_pat(); PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); + + /* Indicate that we are resumed */ CPU_CLR_ATOMIC(cpu, &suspended_cpus); } @@ -1528,7 +1529,6 @@ cpususpend_handler(void) ia32_pause(); CPU_CLR_ATOMIC(cpu, &started_cpus); - CPU_CLR_ATOMIC(cpu, &stopped_cpus); /* Resume MCA and local APIC */ mca_resume();