From 1aac0dffaf0cf39fe6b9b540ee647f2cb7dff222 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Tue, 14 May 2019 14:48:23 +0800 Subject: [PATCH] HV: hot fix on usage of CONFIG_ACPI_PARSE_ENABLED The acpi_fixup() is only called when CONFIG_ACPI_PARSE_ENABLED is enabled; Tracked-On: #3107 Signed-off-by: Victor Sun --- hypervisor/boot/guest/vboot_wrapper.c | 2 +- hypervisor/boot/include/acpi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hypervisor/boot/guest/vboot_wrapper.c b/hypervisor/boot/guest/vboot_wrapper.c index 98ec5f5be..049240b0b 100644 --- a/hypervisor/boot/guest/vboot_wrapper.c +++ b/hypervisor/boot/guest/vboot_wrapper.c @@ -66,7 +66,7 @@ void init_vboot_operations(void) /* @pre: vboot_ops->init != NULL */ void init_vboot(void) { -#ifndef CONFIG_ACPI_PARSE_ENABLED +#ifdef CONFIG_ACPI_PARSE_ENABLED acpi_fixup(); #endif vboot_ops->init(); diff --git a/hypervisor/boot/include/acpi.h b/hypervisor/boot/include/acpi.h index 42e8b4994..c1786dfb2 100644 --- a/hypervisor/boot/include/acpi.h +++ b/hypervisor/boot/include/acpi.h @@ -36,7 +36,7 @@ struct ioapic_info; uint16_t parse_madt(uint32_t lapic_id_array[CONFIG_MAX_PCPU_NUM]); uint16_t parse_madt_ioapic(struct ioapic_info *ioapic_id_array); -#ifndef CONFIG_ACPI_PARSE_ENABLED +#ifdef CONFIG_ACPI_PARSE_ENABLED void acpi_fixup(void); #endif