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

Enable acpi shutdown on all ACPI platforms.

Browse source 
* grub-core/Makefile.core.def (halt): Inlude commands/acpihalt.c
	on coreboo, multiboot and EFI.
	* grub-core/commands/acpihalt.c (get_sleep_type): Add missing casts.
	(grub_acpi_halt): Likewise.
	* grub-core/commands/i386/pc/halt.c (grub_halt): Call grub_acpi_halt.
	(grub_cmd_halt): Don't call grub_acpi_halt directly.
	* grub-core/lib/efi/halt.c (grub_halt): Call grub_acpi_halt.
	* grub-core/lib/i386/halt.c (grub_halt)
	[GRUB_MACHINE_COREBOOT || GRUB_MACHINE_MULTIBOOT]: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-13 20:29:15 +02:00
parent 0575c7c3ec
commit 2419f17a09
6 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/commands/i386/pc/halt.c
View file

@ -47,6 +47,8 @@ grub_halt (int no_apm)
{
struct grub_bios_int_registers regs;
grub_acpi_halt ();
if (no_apm)
stop ();
@ -102,8 +104,6 @@ grub_cmd_halt (grub_extcmd_context_t ctxt,
struct grub_arg_list *state = ctxt->state;
int no_apm = 0;
grub_acpi_halt ();
if (state[0].set)
no_apm = 1;
grub_halt (no_apm);