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

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / acpi / realmode / wakeup.lds.S

diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
index 060fff8f5c5bdf257fd9f4c94827db6d01149107..d4f8010a5b1b876dd14f3267af5b644bc71f8801 100644 (file)
--- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S
+++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
@@ -13,9 +13,19 @@ ENTRY(_start)
 SECTIONS
 {
        . = 0;
+       .jump   : {
+               *(.jump)
+       } = 0x90909090
+
+       . = WAKEUP_HEADER_OFFSET;
+       .header : {
+               *(.header)
+       }
+
+       . = ALIGN(16);
        .text : {
                 *(.text*)
-       }
+       } = 0x90909090
 
        . = ALIGN(16);
        .rodata : {
@@ -33,11 +43,6 @@ SECTIONS
                 *(.data*)
        }
 
-       .signature : {
-               end_signature = .;
-               LONG(0x65a22c82)
-       }
-
        . = ALIGN(16);
        .bss :  {
                __bss_start = .;
@@ -45,20 +50,13 @@ SECTIONS
                __bss_end = .;
        }
 
-       . = HEADER_OFFSET;
-       .header : {
-               *(.header)
+       .signature : {
+               *(.signature)
        }
 
-       . = ALIGN(16);
        _end = .;
 
        /DISCARD/ : {
                *(.note*)
        }
-
-       /*
-        * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility:
-        */
-       . = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
 }