d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for r236772.

Browse Source 
- 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@
This commit is contained in:
Mitsuru IWASAKI 2012-06-10 02:38:51 +00:00
parent dc3fe0ff0e
commit 8a6c6fadc7
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/mp_machdep.c
View File

@ -1416,7 +1416,6 @@ cpususpend_handler(void)
if (savectx(susppcbs[cpu])) { if (savectx(susppcbs[cpu])) {
ctx_fpusave(susppcbs[cpu]->pcb_fpususpend); ctx_fpusave(susppcbs[cpu]->pcb_fpususpend);
wbinvd(); wbinvd();
CPU_SET_ATOMIC(cpu, &stopped_cpus);
CPU_SET_ATOMIC(cpu, &suspended_cpus); CPU_SET_ATOMIC(cpu, &suspended_cpus);
} else { } else {
pmap_init_pat(); pmap_init_pat();
@ -1426,6 +1425,8 @@ cpususpend_handler(void)
initializecpu(); initializecpu();
PCPU_SET(switchtime, 0); PCPU_SET(switchtime, 0);
PCPU_SET(switchticks, ticks); PCPU_SET(switchticks, ticks);
/* Indicate that we are resumed */
CPU_CLR_ATOMIC(cpu, &suspended_cpus); CPU_CLR_ATOMIC(cpu, &suspended_cpus);
} }
@ -1434,7 +1435,6 @@ cpususpend_handler(void)
ia32_pause(); ia32_pause();
CPU_CLR_ATOMIC(cpu, &started_cpus); CPU_CLR_ATOMIC(cpu, &started_cpus);
CPU_CLR_ATOMIC(cpu, &stopped_cpus);
/* Resume MCA and local APIC */ /* Resume MCA and local APIC */
mca_resume(); mca_resume();

2
sys/conf/files.amd64
View File

@ -93,7 +93,6 @@ acpi_wakedata.h optional acpi \
no-obj no-implicit-rule before-depend \ no-obj no-implicit-rule before-depend \
clean "acpi_wakedata.h" clean "acpi_wakedata.h"
# #
x86/acpica/acpi_wakeup.c optional acpi
amd64/amd64/amd64_mem.c optional mem amd64/amd64/amd64_mem.c optional mem
#amd64/amd64/apic_vector.S standard #amd64/amd64/apic_vector.S standard
amd64/amd64/atomic.c standard amd64/amd64/atomic.c standard
@ -453,6 +452,7 @@ contrib/x86emu/x86emu.c optional x86bios | atkbd | dpms | vesa
# #
x86/acpica/OsdEnvironment.c optional acpi x86/acpica/OsdEnvironment.c optional acpi
x86/acpica/acpi_apm.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/madt.c optional acpi
x86/acpica/srat.c optional acpi x86/acpica/srat.c optional acpi
x86/bios/smbios.c optional smbios x86/bios/smbios.c optional smbios

2
sys/conf/files.i386
View File

@ -381,7 +381,6 @@ acpi_wakedata.h optional acpi \
no-obj no-implicit-rule before-depend \ no-obj no-implicit-rule before-depend \
clean "acpi_wakedata.h" clean "acpi_wakedata.h"
# #
x86/acpica/acpi_wakeup.c optional acpi
i386/bios/apm.c optional apm i386/bios/apm.c optional apm
i386/bios/mca_machdep.c optional mca i386/bios/mca_machdep.c optional mca
i386/bios/smapi.c optional smapi i386/bios/smapi.c optional smapi
@ -505,6 +504,7 @@ compat/x86bios/x86bios.c optional x86bios | atkbd | dpms | vesa
# #
x86/acpica/OsdEnvironment.c optional acpi x86/acpica/OsdEnvironment.c optional acpi
x86/acpica/acpi_apm.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/madt.c optional acpi apic
x86/acpica/srat.c optional acpi x86/acpica/srat.c optional acpi
x86/bios/smbios.c optional smbios x86/bios/smbios.c optional smbios

4
sys/i386/i386/mp_machdep.c
View File

@ -1514,12 +1514,13 @@ cpususpend_handler(void)
if (savectx(susppcbs[cpu])) { if (savectx(susppcbs[cpu])) {
wbinvd(); wbinvd();
CPU_SET_ATOMIC(cpu, &stopped_cpus);
CPU_SET_ATOMIC(cpu, &suspended_cpus); CPU_SET_ATOMIC(cpu, &suspended_cpus);
} else { } else {
pmap_init_pat(); pmap_init_pat();
PCPU_SET(switchtime, 0); PCPU_SET(switchtime, 0);
PCPU_SET(switchticks, ticks); PCPU_SET(switchticks, ticks);
/* Indicate that we are resumed */
CPU_CLR_ATOMIC(cpu, &suspended_cpus); CPU_CLR_ATOMIC(cpu, &suspended_cpus);
} }
@ -1528,7 +1529,6 @@ cpususpend_handler(void)
ia32_pause(); ia32_pause();
CPU_CLR_ATOMIC(cpu, &started_cpus); CPU_CLR_ATOMIC(cpu, &started_cpus);
CPU_CLR_ATOMIC(cpu, &stopped_cpus);
/* Resume MCA and local APIC */ /* Resume MCA and local APIC */
mca_resume(); mca_resume();