diff options
| author |  Will Deacon <will@kernel.org>
| 2020-01-22 11:34:21 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org>
| 2020-01-22 11:34:21 +0000 |
| commit | aa246c056c43d41140c26706e519b498f056de8a (patch) | |
| tree | 6de3f0de377603cb4f38781dae786d9d9b1affa7 /arch/arm64/include | |
| parent | Merge branches 'for-next/acpi', 'for-next/cpufeatures', 'for-next/csum', 'for... (diff) | |
| parent | arm64: kernel: Correct annotation of end of el0_sync (diff) | |
| download | linux-aa246c056c43d41140c26706e519b498f056de8a.tar.gz linux-aa246c056c43d41140c26706e519b498f056de8a.tar.bz2 linux-aa246c056c43d41140c26706e519b498f056de8a.zip | |
Merge branch 'for-next/asm-annotations' into for-next/core
* for-next/asm-annotations: (6 commits)
arm64: kernel: Correct annotation of end of el0_sync
...
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/assembler.h | 11 | ||||
| -rw-r--r-- | arch/arm64/include/asm/linkage.h | 16 |
2 files changed, 16 insertions, 11 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 995362adaac0..524b3eaf200a 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -449,17 +449,6 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU .endm /* - * Annotate a function as position independent, i.e., safe to be called before - * the kernel virtual mapping is activated. - */ -#define ENDPIPROC(x) \ - .globl __pi_##x; \ - .type __pi_##x, %function; \ - .set __pi_##x, x; \ - .size __pi_##x, . - x; \ - ENDPROC(x) - -/* * Annotate a function as being unsuitable for kprobes. */ #ifdef CONFIG_KPROBES diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h index 1b266292f0be..ebee3113a62f 100644 --- a/arch/arm64/include/asm/linkage.h +++ b/arch/arm64/include/asm/linkage.h @@ -4,4 +4,20 @@ #define __ALIGN .align 2 #define __ALIGN_STR ".align 2" +/* + * Annotate a function as position independent, i.e., safe to be called before + * the kernel virtual mapping is activated. + */ +#define SYM_FUNC_START_PI(x) \ + SYM_FUNC_START_ALIAS(__pi_##x); \ + SYM_FUNC_START(x) + +#define SYM_FUNC_START_WEAK_PI(x) \ + SYM_FUNC_START_ALIAS(__pi_##x); \ + SYM_FUNC_START_WEAK(x) + +#define SYM_FUNC_END_PI(x) \ + SYM_FUNC_END(x); \ + SYM_FUNC_END_ALIAS(__pi_##x) + #endif |