tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

powerpc/book3s64/hash/kuap: Enable kuap on hash

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Reviewed-by: Sandipan Das <sandipan@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201127044424.40686-20-aneesh.kumar@linux.ibm.com

authored by

Aneesh Kumar K.V and committed by
Michael Ellerman b2ff33a1 292f86c4

+6 -1
+6 -1
arch/powerpc/mm/book3s64/pkeys.c
··· 265 265 #ifdef CONFIG_PPC_KUAP 266 266 void __init setup_kuap(bool disabled) 267 267 { 268 - if (disabled || !early_radix_enabled()) 268 + if (disabled) 269 + return; 270 + /* 271 + * On hash if PKEY feature is not enabled, disable KUAP too. 272 + */ 273 + if (!early_radix_enabled() && !early_mmu_has_feature(MMU_FTR_PKEY)) 269 274 return; 270 275 271 276 if (smp_processor_id() == boot_cpuid) {