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

Return B_NOT_SUPPORTED for shutdown if ACPI is unavailable (no APM on x86_64).

Browse Source
This commit is contained in:
Alex Smith
2012-07-11 12:23:18 +01:00
parent 5670b0a8e4
commit 609b308e64
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_cpu.cpp
+5 -3
View File
@@ -1026,11 +1026,13 @@ arch_cpu_shutdown(bool rebootSystem)
if (acpi_shutdown(rebootSystem) == B_OK) if (acpi_shutdown(rebootSystem) == B_OK)
return B_OK; return B_OK;
// TODO x86_64 if (!rebootSystem) {
#ifndef __x86_64 #ifndef __x86_64__
if (!rebootSystem)
return apm_shutdown(); return apm_shutdown();
#else
return B_NOT_SUPPORTED;
#endif #endif
}
cpu_status state = disable_interrupts(); cpu_status state = disable_interrupts();