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/acpi/wakeup_rm.S | |
| 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/acpi/wakeup_rm.S')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_rm.S | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_rm.S b/arch/x86/kernel/acpi/wakeup_rm.S index 6ff3b573057..6ce81ee9cb0 100644 --- a/arch/x86/kernel/acpi/wakeup_rm.S +++ b/arch/x86/kernel/acpi/wakeup_rm.S @@ -2,9 +2,11 @@ * Wrapper script for the realmode binary as a transport object * before copying to low memory. */ - .section ".rodata","a" - .globl wakeup_code_start, wakeup_code_end -wakeup_code_start: +#include <asm/page_types.h> + + .section ".x86_trampoline","a" + .balign PAGE_SIZE + .globl acpi_wakeup_code +acpi_wakeup_code: .incbin "arch/x86/kernel/acpi/realmode/wakeup.bin" -wakeup_code_end: .size wakeup_code_start, .-wakeup_code_start |