i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Moved the "run me on the boot CPU" code to where it is actually used.

Browse Source 
* Added a TODO that thread_yield() doesn't like to be called from the idle
  thread.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38109 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-15 10:17:42 +00:00
parent 48a05691c4
commit 7a1123a7bf
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_cpu.cpp
+9 -7
View File
@@ -124,6 +124,15 @@ acpi_shutdown(bool rebootSystem)
if (rebootSystem) { if (rebootSystem) {
status = acpi->reboot(); status = acpi->reboot();
} else { } else {
// Make sure we run on the boot CPU (apparently needed for some ACPI
// implementations)
_user_set_cpu_enabled(0, true);
for (int32 cpu = 1; cpu < smp_get_num_cpus(); cpu++) {
_user_set_cpu_enabled(cpu, false);
}
// TODO: must not be called from the idle thread!
thread_yield(true);
status = acpi->prepare_sleep_state(ACPI_POWER_STATE_OFF, NULL, 0); status = acpi->prepare_sleep_state(ACPI_POWER_STATE_OFF, NULL, 0);
if (status == B_OK) { if (status == B_OK) {
//cpu_status state = disable_interrupts(); //cpu_status state = disable_interrupts();
@@ -913,13 +922,6 @@ error:
status_t status_t
arch_cpu_shutdown(bool rebootSystem) arch_cpu_shutdown(bool rebootSystem)
{ {
// Make sure we run on the boot CPU (apparently needed for ACPI)
_user_set_cpu_enabled(0, true);
for (int32 cpu = 1; cpu < smp_get_num_cpus(); cpu++) {
_user_set_cpu_enabled(cpu, false);
}
thread_yield(true);
if (acpi_shutdown(rebootSystem) == B_OK) if (acpi_shutdown(rebootSystem) == B_OK)
return B_OK; return B_OK;