x86: acpi: Fix Windows S3 resume failure

[people/ms/u-boot.git] / arch / x86 / cpu / cpu.c

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index dfe624f54a52872007eaa5356729cad1b0152155..e13786efa590018e2a8b9357d12caad66095a4d6 100644 (file)
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -278,13 +278,17 @@ int reserve_arch(void)
        high_table_reserve();
 #endif
 
-#if defined(CONFIG_HAVE_ACPI_RESUME) && defined(CONFIG_HAVE_FSP)
+#ifdef CONFIG_HAVE_ACPI_RESUME
+       acpi_s3_reserve();
+
+#ifdef CONFIG_HAVE_FSP
        /*
         * Save stack address to CMOS so that at next S3 boot,
         * we can use it as the stack address for fsp_contiue()
         */
        fsp_save_s3_stack();
-#endif
+#endif /* CONFIG_HAVE_FSP */
+#endif /* CONFIG_HAVE_ACPI_RESUME */
 
        return 0;
 }