diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2019-10-11 13:50:57 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-10-18 11:27:44 +0200 |
| commit | 26ba4e5738a544aa17c462bfbe580e74071c810b (patch) | |
| tree | cbdb425c128f8dc0021611d9fd0dfc7b28b98962 /arch/x86/realmode | |
| parent | 37818afd15fe720571955e2f51555a9ffc84363a (diff) | |
| download | linux-26ba4e5738a544aa17c462bfbe580e74071c810b.tar.bz2 | |
x86/asm: Use SYM_INNER_LABEL instead of GLOBAL
The GLOBAL macro had several meanings and is going away. Convert all the
inner function labels marked with GLOBAL to use SYM_INNER_LABEL instead.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: linux-arch@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20191011115108.12392-18-jslaby@suse.cz
Diffstat (limited to 'arch/x86/realmode')
| -rw-r--r-- | arch/x86/realmode/rm/reboot.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S index cd2f97b9623b..f91425a01f8f 100644 --- a/arch/x86/realmode/rm/reboot.S +++ b/arch/x86/realmode/rm/reboot.S @@ -33,7 +33,7 @@ ENTRY(machine_real_restart_asm) movl %eax, %cr0 ljmpl $__KERNEL32_CS, $pa_machine_real_restart_paging_off -GLOBAL(machine_real_restart_paging_off) +SYM_INNER_LABEL(machine_real_restart_paging_off, SYM_L_GLOBAL) xorl %eax, %eax xorl %edx, %edx movl $MSR_EFER, %ecx |