Merge tag 'char-misc-5.13-rc1-round2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm64 / kernel / smp_spin_table.c

diff --git a/arch/arm64/kernel/smp_spin_table.c b/arch/arm64/kernel/smp_spin_table.c
index 056772c..c45a835 100644 (file)
--- a/arch/arm64/kernel/smp_spin_table.c
+++ b/arch/arm64/kernel/smp_spin_table.c
@@ -66,6 +66,7 @@ static int smp_spin_table_cpu_init(unsigned int cpu)
 static int smp_spin_table_cpu_prepare(unsigned int cpu)
 {
        __le64 __iomem *release_addr;
+       phys_addr_t pa_holding_pen = __pa_symbol(function_nocfi(secondary_holding_pen));
 
        if (!cpu_release_addr[cpu])
                return -ENODEV;
@@ -88,7 +89,7 @@ static int smp_spin_table_cpu_prepare(unsigned int cpu)
         * boot-loader's endianness before jumping. This is mandated by
         * the boot protocol.
         */
-       writeq_relaxed(__pa_symbol(secondary_holding_pen), release_addr);
+       writeq_relaxed(pa_holding_pen, release_addr);
        __flush_dcache_area((__force void *)release_addr,
                            sizeof(*release_addr));