Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee78fdc7 authored by James Morse's avatar James Morse Committed by Will Deacon
Browse files

arm64: Create sections.h 



Each time new section markers are added, kernel/vmlinux.ld.S is updated,
and new extern char __start_foo[] definitions are scattered through the
tree.

Create asm/include/sections.h to collect these definitions (and include
the existing asm-generic version).

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent cab15ce6

arch/arm64/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ generic-y += poll.h 
generic-y += preempt.h

generic-y += resource.h

generic-y += rwsem.h

generic-y += sections.h

generic-y += segment.h

generic-y += sembuf.h

generic-y += serial.h

arch/arm64/include/asm/sections.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 ARM Limited

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_SECTIONS_H

#define __ASM_SECTIONS_H



#include <asm-generic/sections.h>



extern char __alt_instructions[], __alt_instructions_end[];

extern char __exception_text_start[], __exception_text_end[];

extern char __hibernate_exit_text_start[], __hibernate_exit_text_end[];

extern char __hyp_idmap_text_start[], __hyp_idmap_text_end[];

extern char __hyp_text_start[], __hyp_text_end[];

extern char __idmap_text_start[], __idmap_text_end[];

extern char __irqentry_text_start[], __irqentry_text_end[];



#endif /* __ASM_SECTIONS_H */

arch/arm64/include/asm/traps.h

+1 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define __ASM_TRAP_H



#include <linux/list.h>

#include <asm/sections.h>



struct pt_regs;
@@ -39,9 +40,6 @@ void arm64_notify_segfault(struct pt_regs *regs, unsigned long addr); 
#ifdef CONFIG_FUNCTION_GRAPH_TRACER

static inline int __in_irqentry_text(unsigned long ptr)

{

	extern char __irqentry_text_start[];

	extern char __irqentry_text_end[];



	return ptr >= (unsigned long)&__irqentry_text_start &&

	       ptr < (unsigned long)&__irqentry_text_end;

}
@@ -54,8 +52,6 @@ static inline int __in_irqentry_text(unsigned long ptr) 


static inline int in_exception_text(unsigned long ptr)

{

	extern char __exception_text_start[];

	extern char __exception_text_end[];

	int in;



	in = ptr >= (unsigned long)&__exception_text_start &&

arch/arm64/include/asm/virt.h

+1 −8
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#ifndef __ASSEMBLY__



#include <asm/ptrace.h>

#include <asm/sections.h>



/*

 * __boot_cpu_mode records what mode CPUs were booted in.
@@ -87,14 +88,6 @@ extern void verify_cpu_run_el(void); 
static inline void verify_cpu_run_el(void) {}

#endif



/* The section containing the hypervisor idmap text */

extern char __hyp_idmap_text_start[];

extern char __hyp_idmap_text_end[];



/* The section containing the hypervisor text */

extern char __hyp_text_start[];

extern char __hyp_text_end[];



#endif /* __ASSEMBLY__ */



#endif /* ! __ASM__VIRT_H */

arch/arm64/kernel/alternative.c

+3 −4
Original line number Diff line number Diff line
@@ -25,14 +25,13 @@ 
#include <asm/alternative.h>

#include <asm/cpufeature.h>

#include <asm/insn.h>

#include <asm/sections.h>

#include <linux/stop_machine.h>



#define __ALT_PTR(a,f)		(u32 *)((void *)&(a)->f + (a)->f)

#define ALT_ORIG_PTR(a)		__ALT_PTR(a, orig_offset)

#define ALT_REPL_PTR(a)		__ALT_PTR(a, alt_offset)



extern struct alt_instr __alt_instructions[], __alt_instructions_end[];



struct alt_region {

	struct alt_instr *begin;

	struct alt_instr *end;
@@ -124,8 +123,8 @@ static int __apply_alternatives_multi_stop(void *unused) 
{

	static int patched = 0;

	struct alt_region region = {

		.begin	= __alt_instructions,

		.end	= __alt_instructions_end,

		.begin	= (struct alt_instr *)__alt_instructions,

		.end	= (struct alt_instr *)__alt_instructions_end,

	};



	/* We always have a CPU 0 at this point (__init) */