summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2021-06-28 06:56:11 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2021-06-30 22:20:39 +1000
commitc89e632658e793fbbdcbfbe80a6c13bbf7203e9b (patch)
treeb6c67004af4fe0b318fce9d7b395227c0b29c9f5 /arch
parentb064037ea4104120418ccbf39951a6d529a9d6d5 (diff)
downloadlinux-c89e632658e793fbbdcbfbe80a6c13bbf7203e9b.tar.gz
linux-c89e632658e793fbbdcbfbe80a6c13bbf7203e9b.tar.bz2
linux-c89e632658e793fbbdcbfbe80a6c13bbf7203e9b.zip
powerpc/32s: Fix setup_{kuap/kuep}() on SMP
On SMP, setup_kup() is also called from start_secondary(). start_secondary() is not an __init function. Remove the __init marker from setup_kuep() and setup_kuap(). Fixes: 86f46f343272 ("powerpc/32s: Initialise KUAP and KUEP in C") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/42f4bd12b476942e4d5dc81c0e839d8871b20b1c.1624863319.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/mm/book3s32/kuap.c2
-rw-r--r--arch/powerpc/mm/book3s32/kuep.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/book3s32/kuap.c b/arch/powerpc/mm/book3s32/kuap.c
index 9df6911b8fde..0f920f09af57 100644
--- a/arch/powerpc/mm/book3s32/kuap.c
+++ b/arch/powerpc/mm/book3s32/kuap.c
@@ -18,7 +18,7 @@ void kuap_unlock_all_ool(void)
}
EXPORT_SYMBOL(kuap_unlock_all_ool);
-void __init setup_kuap(bool disabled)
+void setup_kuap(bool disabled)
{
if (!disabled)
kuap_lock_all_ool();
diff --git a/arch/powerpc/mm/book3s32/kuep.c b/arch/powerpc/mm/book3s32/kuep.c
index 3f6eb6e23fca..c20733d6e02c 100644
--- a/arch/powerpc/mm/book3s32/kuep.c
+++ b/arch/powerpc/mm/book3s32/kuep.c
@@ -5,7 +5,7 @@
struct static_key_false disable_kuep_key;
-void __init setup_kuep(bool disabled)
+void setup_kuep(bool disabled)
{
if (!disabled)
kuep_lock();