]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
powerpc/32s: Disable VMAP stack which CONFIG_ADB_PMU
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Thu, 27 Aug 2020 18:30:27 +0000 (18:30 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 28 Aug 2020 02:03:18 +0000 (12:03 +1000)
low_sleep_handler() can't restore the context from virtual
stack because the stack can hardly be accessed with MMU OFF.

For now, disable VMAP stack when CONFIG_ADB_PMU is selected.

Fixes: cd08f109e262 ("powerpc/32s: Enable CONFIG_VMAP_STACK")
Cc: stable@vger.kernel.org # v5.6+
Reported-by: Giuseppe Sacco <giuseppe@sguazz.it>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/ec96c15bfa1a7415ab604ee1c98cd45779c08be0.1598553015.git.christophe.leroy@csgroup.eu
arch/powerpc/platforms/Kconfig.cputype

index 87737ec86d39aa3b9236bb5b27408f081d82e4d9..1dc9d3c818726b5e78a64c9b04efdb136bcb43d2 100644 (file)
@@ -36,7 +36,7 @@ config PPC_BOOK3S_6xx
        select PPC_HAVE_PMU_SUPPORT
        select PPC_HAVE_KUEP
        select PPC_HAVE_KUAP
-       select HAVE_ARCH_VMAP_STACK
+       select HAVE_ARCH_VMAP_STACK if !ADB_PMU
 
 config PPC_BOOK3S_601
        bool "PowerPC 601"