Merge tag 'linux-kselftest-next-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-microblaze.git] / arch / arm64 / kernel / cpu-reset.h

diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h
index ed50e95..9a7b126 100644 (file)
--- a/arch/arm64/kernel/cpu-reset.h
+++ b/arch/arm64/kernel/cpu-reset.h
@@ -13,16 +13,16 @@
 void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry,
        unsigned long arg0, unsigned long arg1, unsigned long arg2);
 
-static inline void __noreturn cpu_soft_restart(unsigned long entry,
-                                              unsigned long arg0,
-                                              unsigned long arg1,
-                                              unsigned long arg2)
+static inline void __noreturn __nocfi cpu_soft_restart(unsigned long entry,
+                                                      unsigned long arg0,
+                                                      unsigned long arg1,
+                                                      unsigned long arg2)
 {
        typeof(__cpu_soft_restart) *restart;
 
        unsigned long el2_switch = !is_kernel_in_hyp_mode() &&
                is_hyp_mode_available();
-       restart = (void *)__pa_symbol(__cpu_soft_restart);
+       restart = (void *)__pa_symbol(function_nocfi(__cpu_soft_restart));
 
        cpu_install_idmap();
        restart(el2_switch, entry, arg0, arg1, arg2);