[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170421141305.25180-14-jslaby@suse.cz>
Date: Fri, 21 Apr 2017 16:12:50 +0200
From: Jiri Slaby <jslaby@...e.cz>
To: mingo@...hat.com
Cc: tglx@...utronix.de, hpa@...or.com, x86@...nel.org,
jpoimboe@...hat.com, linux-kernel@...r.kernel.org,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH v3 14/29] x86: boot, annotate local functions
relocated and no_longmode are self-standing local functions, annotate
them as such.
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: x86@...nel.org
---
arch/x86/boot/compressed/head_32.S | 3 ++-
arch/x86/boot/compressed/head_64.S | 7 +++++--
2 files changed, 7 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 3e5752efccff..46c132ab5f21 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -380,7 +380,7 @@ ENDPROC(efi64_stub_entry)
#endif
.text
-relocated:
+SYM_FUNC_START_LOCAL(relocated)
/*
* Clear BSS (stack is currently empty)
@@ -422,13 +422,16 @@ relocated:
* Jump to the decompressed kernel.
*/
jmp *%rax
+SYM_FUNC_END(relocated)
.code32
-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.12.2
Powered by blists - more mailing lists