From owner-svn-src-all@FreeBSD.ORG Tue Jun 22 16:20:11 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BCF8106566C; Tue, 22 Jun 2010 16:20:11 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D56A68FC14; Tue, 22 Jun 2010 16:20:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5MGKAIG094249; Tue, 22 Jun 2010 16:20:10 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5MGKAfq094244; Tue, 22 Jun 2010 16:20:10 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201006221620.o5MGKAfq094244@svn.freebsd.org> From: Alexander Motin Date: Tue, 22 Jun 2010 16:20:10 +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: r209432 - in head/sys: amd64/amd64 conf i386/i386 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2010 16:20:11 -0000 Author: mav Date: Tue Jun 22 16:20:10 2010 New Revision: 209432 URL: http://svn.freebsd.org/changeset/base/209432 Log: Some style fixes for r209371. Submitted by: jhb@ 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 Tue Jun 22 16:10:48 2010 (r209431) +++ head/sys/amd64/amd64/mp_machdep.c Tue Jun 22 16:20:10 2010 (r209432) @@ -706,9 +706,11 @@ init_secondary(void) load_es(_udatasel); load_fs(_ufssel); mtx_unlock_spin(&ap_boot_mtx); - /* wait until all the AP's are up */ + + /* Wait until all the AP's are up. */ while (smp_started == 0) ia32_pause(); + /* Start per-CPU event timers. */ cpu_initclocks_ap(); Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Tue Jun 22 16:10:48 2010 (r209431) +++ head/sys/conf/files.amd64 Tue Jun 22 16:20:10 2010 (r209432) @@ -297,7 +297,6 @@ x86/cpufreq/p4tcc.c optional cpufreq x86/isa/atpic.c optional atpic isa x86/isa/atrtc.c standard x86/isa/clock.c standard -x86/x86/timeevents.c standard x86/isa/elcr.c standard x86/isa/isa.c standard x86/isa/isa_dma.c standard @@ -307,3 +306,4 @@ x86/x86/io_apic.c standard x86/x86/local_apic.c standard x86/x86/mca.c standard x86/x86/msi.c optional pci +x86/x86/timeevents.c standard Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Tue Jun 22 16:10:48 2010 (r209431) +++ head/sys/conf/files.i386 Tue Jun 22 16:20:10 2010 (r209432) @@ -381,7 +381,6 @@ x86/cpufreq/smist.c optional cpufreq x86/isa/atpic.c optional atpic x86/isa/atrtc.c optional atpic x86/isa/clock.c optional native -x86/x86/timeevents.c standard x86/isa/elcr.c standard x86/isa/isa.c optional isa x86/isa/isa_dma.c optional isa @@ -391,3 +390,4 @@ x86/x86/io_apic.c optional apic x86/x86/local_apic.c optional apic x86/x86/mca.c standard x86/x86/msi.c optional apic pci +x86/x86/timeevents.c standard Modified: head/sys/i386/i386/mp_machdep.c ============================================================================== --- head/sys/i386/i386/mp_machdep.c Tue Jun 22 16:10:48 2010 (r209431) +++ head/sys/i386/i386/mp_machdep.c Tue Jun 22 16:20:10 2010 (r209432) @@ -728,13 +728,15 @@ init_secondary(void) } mtx_unlock_spin(&ap_boot_mtx); - /* wait until all the AP's are up */ + + /* Wait until all the AP's are up. */ while (smp_started == 0) ia32_pause(); + /* Start per-CPU event timers. */ cpu_initclocks_ap(); - /* enter the scheduler */ + /* Enter the scheduler. */ sched_throw(NULL); panic("scheduler returned us to %s", __func__);