diff options
| author | mav <mav@FreeBSD.org> | 2010-06-22 16:20:10 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2010-06-22 16:20:10 +0000 |
| commit | 79968169e934b9ecf6c8e3a1a3225f0589c8fdf4 (patch) | |
| tree | 0f85bd84956f3902865d686b6eebbc7b85f241a9 /sys | |
| parent | 05fa7e773aea46aa7b2e47f949c68e740e736502 (diff) | |
| download | FreeBSD-src-79968169e934b9ecf6c8e3a1a3225f0589c8fdf4.zip FreeBSD-src-79968169e934b9ecf6c8e3a1a3225f0589c8fdf4.tar.gz | |
Some style fixes for r209371.
Submitted by: jhb@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 4 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 2 | ||||
| -rw-r--r-- | sys/i386/i386/mp_machdep.c | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index fa26c7e..02e7505 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -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(); diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index c0636a9..cd273ce 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -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 diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 9cb19ea..2382fb1 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -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 diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 4e3ec3e..14e8327 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -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__); |
