diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2019-10-11 14:50:58 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-10-18 12:28:47 +0300 |
| commit | 78f44330d80e2632856b840cf82aa554f34415a1 (patch) | |
| tree | 8835eda9eb96bd27d2c7ccacfbdfb5ecb83a6bf8 /arch/x86/realmode/rm/trampoline_32.S | |
| parent | 26ba4e5738a544aa17c462bfbe580e74071c810b (diff) | |
| download | linux-78f44330d80e2632856b840cf82aa554f34415a1.tar.xz | |
x86/asm/realmode: Use SYM_DATA_* instead of GLOBAL
GLOBAL had several meanings and is going away. Convert all the data
marked using GLOBAL to use SYM_DATA_START or SYM_DATA instead.
Note that SYM_DATA_END_LABEL is used to generate tr_gdt_end too.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-arch@vger.kernel.org
Cc: Pingfan Liu <kernelfans@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20191011115108.12392-19-jslaby@suse.cz
Diffstat (limited to 'arch/x86/realmode/rm/trampoline_32.S')
| -rw-r--r-- | arch/x86/realmode/rm/trampoline_32.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S index 1868b158480d..ff00594a2ed0 100644 --- a/arch/x86/realmode/rm/trampoline_32.S +++ b/arch/x86/realmode/rm/trampoline_32.S @@ -62,10 +62,10 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S .bss .balign 8 -GLOBAL(trampoline_header) - tr_start: .space 4 - tr_gdt_pad: .space 2 - tr_gdt: .space 6 -END(trampoline_header) +SYM_DATA_START(trampoline_header) + SYM_DATA_LOCAL(tr_start, .space 4) + SYM_DATA_LOCAL(tr_gdt_pad, .space 2) + SYM_DATA_LOCAL(tr_gdt, .space 6) +SYM_DATA_END(trampoline_header) #include "trampoline_common.S" |