From 609b308e64d28acbcac1edde134b427f648914a4 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Wed, 11 Jul 2012 12:23:18 +0100 Subject: [PATCH] Return B_NOT_SUPPORTED for shutdown if ACPI is unavailable (no APM on x86_64). --- src/system/kernel/arch/x86/arch_cpu.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/system/kernel/arch/x86/arch_cpu.cpp b/src/system/kernel/arch/x86/arch_cpu.cpp index 10c94f6de2..9fe0d79075 100644 --- a/src/system/kernel/arch/x86/arch_cpu.cpp +++ b/src/system/kernel/arch/x86/arch_cpu.cpp @@ -1026,11 +1026,13 @@ arch_cpu_shutdown(bool rebootSystem) if (acpi_shutdown(rebootSystem) == B_OK) return B_OK; - // TODO x86_64 -#ifndef __x86_64 - if (!rebootSystem) + if (!rebootSystem) { +#ifndef __x86_64__ return apm_shutdown(); +#else + return B_NOT_SUPPORTED; #endif + } cpu_status state = disable_interrupts();