From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752166AbdFTNdY (ORCPT ); Tue, 20 Jun 2017 09:33:24 -0400 Received: from terminus.zytor.com ([65.50.211.136]:33073 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751101AbdFTNdW (ORCPT ); Tue, 20 Jun 2017 09:33:22 -0400 Date: Tue, 20 Jun 2017 06:29:46 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, kirill.shutemov@linux.intel.com, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, fengguang.wu@intel.com Reply-To: tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, kirill.shutemov@linux.intel.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, fengguang.wu@intel.com, mingo@kernel.org In-Reply-To: <20170616113024.ajmif63cmcszry5a@black.fi.intel.com> References: <20170616113024.ajmif63cmcszry5a@black.fi.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/boot/64: Put __startup_64() into .head.text Git-Commit-ID: 26179670a68b7b365fbfe38afb043dcd2e1a4678 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 26179670a68b7b365fbfe38afb043dcd2e1a4678 Gitweb: http://git.kernel.org/tip/26179670a68b7b365fbfe38afb043dcd2e1a4678 Author: Kirill A. Shutemov AuthorDate: Fri, 16 Jun 2017 14:30:24 +0300 Committer: Ingo Molnar CommitDate: Tue, 20 Jun 2017 12:56:27 +0200 x86/boot/64: Put __startup_64() into .head.text Put __startup_64() and fixup_pointer() into .head.text section to make sure it's always near startup_64() and always callable. Signed-off-by: Kirill A. Shutemov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: kernel test robot Cc: wfg@linux.intel.com Link: http://lkml.kernel.org/r/20170616113024.ajmif63cmcszry5a@black.fi.intel.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/head64.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 2b2ac38..46c3c73 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -38,12 +38,14 @@ extern pmd_t early_dynamic_pgts[EARLY_DYNAMIC_PAGE_TABLES][PTRS_PER_PMD]; static unsigned int __initdata next_early_pgt; pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX); -static void __init *fixup_pointer(void *ptr, unsigned long physaddr) +#define __head __section(.head.text) + +static void __head *fixup_pointer(void *ptr, unsigned long physaddr) { return ptr - (void *)_text + (void *)physaddr; } -void __init __startup_64(unsigned long physaddr) +void __head __startup_64(unsigned long physaddr) { unsigned long load_delta, *p; pgdval_t *pgd;