diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2020-03-08 14:05:33 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 14:05:33 -0300 |
| commit | cd7c926fa65431a20a044f55dbd7609beaffbe46 (patch) | |
| tree | 2111e8c1e50e3fa56fc46bd4e80e5a577459e768 /arch/arm/common/mcpm_entry.c | |
| parent | 6da05a37e79c312208df0a070ea2fdd35a7d5e51 (diff) | |
| parent | f2c1392ff3473a396e4d177ff5ad368b9d6cd211 (diff) | |
Merge pull request #61 from toradex/4.14-2.3.x-imx
4.14 2.3.x imx: net: sch_generic compilation fix, rel_imx_4.14.98_2.3.1_patch and v4.14.170 stable
Diffstat (limited to 'arch/arm/common/mcpm_entry.c')
| -rw-r--r-- | arch/arm/common/mcpm_entry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c index 2b913f17d50f..c24a55b0deac 100644 --- a/arch/arm/common/mcpm_entry.c +++ b/arch/arm/common/mcpm_entry.c @@ -379,7 +379,7 @@ static int __init nocache_trampoline(unsigned long _arg) unsigned int cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); phys_reset_t phys_reset; - mcpm_set_entry_vector(cpu, cluster, cpu_resume); + mcpm_set_entry_vector(cpu, cluster, cpu_resume_no_hyp); setup_mm_for_reboot(); __mcpm_cpu_going_down(cpu, cluster); |