diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2011-02-14 15:42:46 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-02-17 21:05:06 -0800 |
| commit | d1ee433539ea5963a8f946f3428b335d1c5fdb20 (patch) | |
| tree | 64dea26db838ca456be2866de3deeecb3a50b750 /arch/x86/kernel/setup.c | |
| parent | 4822b7fc6d4870685a9feadfc348d48f5e47460a (diff) | |
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>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 7 |
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 */ |