[PATCH v4 07/27] x86: boot, annotate local functions

Jiri Slaby
2017-10-02T09:12:57Z

relocated and no_longmode are self-standing local functions, annotate
them as such.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: x86@kernel.org
---
arch/x86/boot/compressed/head_32.S | 3 ++-
arch/x86/boot/compressed/head_64.S | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index 11c68cf53d4e..d832ddb78ea2 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -208,7 +208,7 @@ ENDPROC(efi32_stub_entry)
#endif

.text
-relocated:
+SYM_FUNC_START_LOCAL(relocated)

/*
* Clear BSS (stack is currently empty)
@@ -259,6 +259,7 @@ relocated:
*/
xorl %ebx, %ebx
jmp *%eax
+SYM_FUNC_END(relocated)

#ifdef CONFIG_EFI_STUB
.data
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index b4a5d284391c..99bb84a44840 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -421,7 +421,7 @@ ENDPROC(efi64_stub_entry)
#endif

.text
-relocated:
+SYM_FUNC_START_LOCAL(relocated)

/*
* Clear BSS (stack is currently empty)
@@ -463,6 +463,7 @@ relocated:
* Jump to the decompressed kernel.
*/
jmp *%rax
+SYM_FUNC_END(relocated)

.code32
#ifdef CONFIG_X86_5LEVEL
@@ -503,11 +504,12 @@ compatible_mode:
lret
#endif

-no_longmode:
+SYM_FUNC_START_LOCAL(no_longmode)
/* This isn't an x86-64 CPU so hang */
1:
hlt
jmp 1b
+SYM_FUNC_END(no_longmode)

#include "../../kernel/verify_cpu.S"

--
2.14.2