vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge mainline into legacy_parser

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-15 11:43:59 +02:00
commit 0cb2f2813f
124 changed files with 3369 additions and 1991 deletions
Download patch file Download diff file Expand all files Collapse all files

5
grub-core/lib/i386/halt.c
View file

@ -18,6 +18,7 @@
#include <grub/cpu/io.h>
#include <grub/misc.h>
#include <grub/acpi.h>
const char bochs_shutdown[] = "Shutdown";
@ -40,6 +41,10 @@ grub_halt (void)
{
unsigned int i;
#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_MULTIBOOT)
grub_acpi_halt ();
#endif
/* Disable interrupts. */
__asm__ __volatile__ ("cli");