Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / arch / x86 / kernel / acpi / wakeup_rm.S

diff --git a/arch/x86/kernel/acpi/wakeup_rm.S b/arch/x86/kernel/acpi/wakeup_rm.S
index 6ff3b57..63b8ab5 100644 (file)
--- 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
+       .size   acpi_wakeup_code, .-acpi_wakeup_code