aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xen/arch/x86/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index a9c1beeba8..47d81c4ada 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -972,6 +972,11 @@ void __init __start_xen(unsigned long mbi_p)
if ( acpi_skip_timer_override &&
!strstr(dom0_cmdline, "acpi_skip_timer_override") )
safe_strcat(dom0_cmdline, " acpi_skip_timer_override");
+ if ( (strlen(acpi_param) == 0) && acpi_disabled )
+ {
+ printk("ACPI is disabled, notifying Domain 0 (acpi=off)\n");
+ safe_strcpy(acpi_param, "off");
+ }
if ( (strlen(acpi_param) != 0) && !strstr(dom0_cmdline, "acpi=") )
{
safe_strcat(dom0_cmdline, " acpi=");