diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2017-06-16 13:30:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-20 12:56:27 +0200 |
| commit | 26179670a68b7b365fbfe38afb043dcd2e1a4678 (patch) | |
| tree | c8757f9b9bfab3e090159a198c0141900851a776 | |
| parent | x86/mm: Add support for 5-level paging for KASLR (diff) | |
| download | linux-26179670a68b7b365fbfe38afb043dcd2e1a4678.tar.xz linux-26179670a68b7b365fbfe38afb043dcd2e1a4678.zip | |
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 <kirill.shutemov@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kernel test robot <fengguang.wu@intel.com>
Cc: wfg@linux.intel.com
Link: http://lkml.kernel.org/r/20170616113024.ajmif63cmcszry5a@black.fi.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | arch/x86/kernel/head64.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 2b2ac381195a..46c3c73e7f43 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; |