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/lib/copy_page.S | |
| parent | 4f6cdf296cc4b5b25c85bd04a84b59e562ce234b (diff) | |
| parent | 73d6890fe8ff40e357039b626537ac82d8782aeb (diff) | |
| download | linux-aa246c056c43d41140c26706e519b498f056de8a.tar.bz2 | |
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/lib/copy_page.S')
| -rw-r--r-- | arch/arm64/lib/copy_page.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/lib/copy_page.S b/arch/arm64/lib/copy_page.S index 290dd3c5266c..e7a793961408 100644 --- a/arch/arm64/lib/copy_page.S +++ b/arch/arm64/lib/copy_page.S @@ -17,7 +17,7 @@ * x0 - dest * x1 - src */ -ENTRY(copy_page) +SYM_FUNC_START(copy_page) alternative_if ARM64_HAS_NO_HW_PREFETCH // Prefetch three cache lines ahead. prfm pldl1strm, [x1, #128] @@ -75,5 +75,5 @@ alternative_else_nop_endif stnp x16, x17, [x0, #112 - 256] ret -ENDPROC(copy_page) +SYM_FUNC_END(copy_page) EXPORT_SYMBOL(copy_page) |