summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/nohash/32
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2021-10-19 09:29:22 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2021-12-09 22:41:18 +1100
commit2341964e27b02b2ca1deef8a18df59d1db7b9085 (patch)
treedfd86d78ae709387c682671a7710935d478dd309 /arch/powerpc/include/asm/nohash/32
parentc252f3846d3114542c606618995e3cbc11775357 (diff)
downloadlinux-2341964e27b02b2ca1deef8a18df59d1db7b9085.tar.bz2
powerpc/kuap: Remove __kuap_assert_locked()
__kuap_assert_locked() is redundant with __kuap_get_and_assert_locked(). Move the verification of CONFIG_PPC_KUAP_DEBUG in kuap_assert_locked() and make it call __kuap_get_and_assert_locked() directly. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/1a60198a25d2ba38a37f1b92bc7d096435df4224.1634627931.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/include/asm/nohash/32')
-rw-r--r--arch/powerpc/include/asm/nohash/32/kup-8xx.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/include/asm/nohash/32/kup-8xx.h b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
index 74f15c386476..37fe4b32b658 100644
--- a/arch/powerpc/include/asm/nohash/32/kup-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
@@ -47,12 +47,6 @@ static inline unsigned long __kuap_get_and_assert_locked(void)
return kuap;
}
-static inline void __kuap_assert_locked(void)
-{
- if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG))
- __kuap_get_and_assert_locked();
-}
-
static inline void __allow_user_access(void __user *to, const void __user *from,
unsigned long size, unsigned long dir)
{