x86, trampoline: Use the unified trampoline setup for ACPI wakeup

Use the unified trampoline allocation setup to allocate and install
the ACPI wakeup code in low memory.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <4D5DFBE4.7090104@intel.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Matthieu Castet <castet.matthieu@free.fr>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>

1 files changed, 0 insertions, 7 deletions

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 994ea20e177c..a089fc19ffae 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -937,13 +937,6 @@ void __init setup_arch(char **cmdline_p)
 
         setup_trampolines();
 
-#ifdef CONFIG_ACPI_SLEEP
-        /*
-         * Reserve low memory region for sleep support.
-         * even before init_memory_mapping
-         */
-        acpi_reserve_wakeup_memory();
-#endif
         init_gbpages();
 
         /* max_pfn_mapped is updated here */