diff options
| author |   Pasha Tatashin <pasha.tatashin@soleen.com> | 2021-09-30 14:31:12 +0000 |
|---|---|---|
| committer |   Will Deacon <will@kernel.org> | 2021-10-01 13:31:00 +0100 |
| commit | 7a2512fa649397c68127a480ef8fdd9dcf323045 (patch) | |
| tree | 1ef11c8acb1f6bc2955eadcf15da6d0981d8d2bc /arch/arm64/kernel/machine_kexec.c | |
| parent | arm64: kexec: remove the pre-kexec PoC maintenance (diff) | |
| download | linux-dev-7a2512fa649397c68127a480ef8fdd9dcf323045.tar.xz linux-dev-7a2512fa649397c68127a480ef8fdd9dcf323045.zip | |
arm64: kexec: remove cpu-reset.h
This header contains only cpu_soft_restart() which is never used directly
anymore. So, remove this header, and rename the helper to be
cpu_soft_restart().
Suggested-by: James Morse <james.morse@arm.com>
Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210930143113.1502553-15-pasha.tatashin@soleen.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/machine_kexec.c')
| -rw-r--r-- | arch/arm64/kernel/machine_kexec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index 559d47a3c59c..1038494135c8 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -24,8 +24,6 @@ #include <asm/sections.h> #include <asm/trans_pgd.h> -#include "cpu-reset.h" - /** * kexec_image_info - For debugging output. */ @@ -201,10 +199,10 @@ void machine_kexec(struct kimage *kimage) * In kexec_file case, the kernel starts directly without purgatory. */ if (kimage->head & IND_DONE) { - typeof(__cpu_soft_restart) *restart; + typeof(cpu_soft_restart) *restart; cpu_install_idmap(); - restart = (void *)__pa_symbol(function_nocfi(__cpu_soft_restart)); + restart = (void *)__pa_symbol(function_nocfi(cpu_soft_restart)); restart(is_hyp_nvhe(), kimage->start, kimage->arch.dtb_mem, 0, 0); } else { |