From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1040863AbdDUOUU (ORCPT ); Fri, 21 Apr 2017 10:20:20 -0400 Received: from mx2.suse.de ([195.135.220.15]:56129 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1040455AbdDUONO (ORCPT ); Fri, 21 Apr 2017 10:13:14 -0400 From: Jiri Slaby To: mingo@redhat.com Cc: tglx@linutronix.de, hpa@zytor.com, x86@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH v3 14/29] x86: boot, annotate local functions Date: Fri, 21 Apr 2017 16:12:50 +0200 Message-Id: <20170421141305.25180-14-jslaby@suse.cz> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170421141305.25180-1-jslaby@suse.cz> References: <20170421141305.25180-1-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org relocated and no_longmode are self-standing local functions, annotate them as such. Signed-off-by: Jiri Slaby Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: x86@kernel.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