Commit 91ec6671 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/32s: Move setup_{kuep/kuap}() into {kuep/kuap}.c 



Avoids the #ifdef in mmu.c

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/0b7a13d414837e58264edc336b89c2fe9f35f9bc.1622708530.git.christophe.leroy@csgroup.eu
parent f6025a14

arch/powerpc/mm/book3s32/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ obj-y += mmu.o mmu_context.o 
obj-$(CONFIG_PPC_BOOK3S_603) += nohash_low.o

obj-$(CONFIG_PPC_BOOK3S_604) += hash_low.o tlb.o

obj-$(CONFIG_PPC_KUEP) += kuep.o

obj-$(CONFIG_PPC_KUAP) += kuap.o

arch/powerpc/mm/book3s32/kuap.c

0 → 100644
+11 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later



#include <asm/kup.h>



void __init setup_kuap(bool disabled)

{

	pr_info("Activating Kernel Userspace Access Protection\n");



	if (disabled)

		pr_warn("KUAP cannot be disabled yet on 6xx when compiled in\n");

}

arch/powerpc/mm/book3s32/kuep.c

+8 −0
Original line number Diff line number Diff line
@@ -38,3 +38,11 @@ void kuep_unlock(void) 
{

	kuep_update(mfsr(0) & ~SR_NX);

}



void __init setup_kuep(bool disabled)

{

	pr_info("Activating Kernel Userspace Execution Prevention\n");



	if (disabled)

		pr_warn("KUEP cannot be disabled yet on 6xx when compiled in\n");

}

arch/powerpc/mm/book3s32/mmu.c

+0 −20
Original line number Diff line number Diff line
@@ -445,26 +445,6 @@ void __init print_system_hash_info(void) 
		pr_info("Hash_mask         = 0x%lx\n", Hash_mask);

}



#ifdef CONFIG_PPC_KUEP

void __init setup_kuep(bool disabled)

{

	pr_info("Activating Kernel Userspace Execution Prevention\n");



	if (disabled)

		pr_warn("KUEP cannot be disabled yet on 6xx when compiled in\n");

}

#endif



#ifdef CONFIG_PPC_KUAP

void __init setup_kuap(bool disabled)

{

	pr_info("Activating Kernel Userspace Access Protection\n");



	if (disabled)

		pr_warn("KUAP cannot be disabled yet on 6xx when compiled in\n");

}

#endif



void __init early_init_mmu(void)

{

}