summaryrefslogtreecommitdiff
path: root/i386/i386at/model_dep.c
diff options
context:
space:
mode:
authorJustus Winter <justus@gnupg.org>2016-11-06 12:45:34 +0100
committerJustus Winter <justus@gnupg.org>2016-11-06 12:45:34 +0100
commitc387012395ec83dbdad5e9a1e31f3a214337d064 (patch)
treeac5a13ffb474e91a56614164e5a0832bd526ca21 /i386/i386at/model_dep.c
parent92476c17e0a4067a5702bb5a4914ed7bceafb3b2 (diff)
Revert "i386: use ACPI to power off the machine"
This reverts commit c031b41b783cc99c0bd5aac7d14c1d6e34520397. Adding the ACPI parser from GRUB was a mistake as its license conflicts with the one used by the legacy Linux drivers. Furthermore, adding support for ACPI to the kernel violates the minimality principle.
Diffstat (limited to 'i386/i386at/model_dep.c')
-rw-r--r--i386/i386at/model_dep.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 6912da75..a7abf5ce 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -72,7 +72,6 @@
#include <i386at/kd.h>
#include <i386at/rtc.h>
#include <i386at/model_dep.h>
-#include <i386at/acpihalt.h>
#ifdef MACH_XEN
#include <xen/console.h>
#include <xen/store.h>
@@ -245,7 +244,6 @@ void halt_all_cpus(boolean_t reboot)
#ifdef MACH_HYP
hyp_halt();
#endif /* MACH_HYP */
- grub_acpi_halt();
printf("In tight loop: hit ctl-alt-del to reboot\n");
(void) spl0();
}