x86, setup: move 32-bit code to .text32

Impact: cleanup

The setup code is mostly 16-bit code, but there is a small stub of
32-bit code at the end.  Move the 32-bit code to a separate segment,
.text32, to avoid scrambling the disassembly.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S
index 019c17a7585115a7cfdb0c27696544b8127599b5..3e0edc6d2a2079892e1a655ef2e7a35a013c4ef3 100644 (file)
--- a/arch/x86/boot/pmjump.S
+++ b/arch/x86/boot/pmjump.S
@@ -47,6 +47,7 @@ GLOBAL(protected_mode_jump)
 ENDPROC(protected_mode_jump)
 
        .code32
+       .section ".text32","ax"
 GLOBAL(in_pm32)
        # Set up data segments for flat 32-bit mode
        movl    %ecx, %ds

diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld
index df9234b3a5e07f6f0dd0bd10a2ad19065306097b..bb8dc2de796936c6a21d0b1bfbd934ca8a3e5877 100644 (file)
--- a/arch/x86/boot/setup.ld
+++ b/arch/x86/boot/setup.ld
@@ -17,7 +17,8 @@ SECTIONS
        .header         : { *(.header) }
        .inittext       : { *(.inittext) }
        .initdata       : { *(.initdata) }
-       .text           : { *(.text*) }
+       .text           : { *(.text) }
+       .text32         : { *(.text32) }
 
        . = ALIGN(16);
        .rodata         : { *(.rodata*) }