From: Nicholas Piggin Date: Fri, 2 Aug 2019 10:56:29 +0000 (+1000) Subject: powerpc/64s/exception: machine check adjust RFI target X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fe9d482b1d87c76441492e51d866cee652eee4d5;p=openwrt%2Fstaging%2Fblogic.git powerpc/64s/exception: machine check adjust RFI target The host kernel delivery case for powernv does RFI_TO_USER_OR_KERNEL, but should just use RFI_TO_KERNEL which makes it clear this is not a user case. This is not a bug because RFI_TO_USER_OR_KERNEL deals with kernel returns just fine. Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20190802105709.27696-5-npiggin@gmail.com --- diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 7c28c22fc6a6..9a7cc3edc721 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1184,7 +1184,7 @@ BEGIN_FTR_SECTION */ bl machine_check_queue_event MACHINE_CHECK_HANDLER_WINDUP - RFI_TO_USER_OR_KERNEL + RFI_TO_KERNEL FTR_SECTION_ELSE /* * pSeries: Return from MC interrupt. Before that stay on emergency