From: Nicholas Piggin Date: Fri, 2 Aug 2019 10:56:26 +0000 (+1000) Subject: powerpc/64s/exception: machine check fwnmi remove HV case X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0be9f7fd5d8fd984b34ad98838ef7cfd0079ddae;p=openwrt%2Fstaging%2Fblogic.git powerpc/64s/exception: machine check fwnmi remove HV case fwnmi does not trigger in HV mode, so remove always-true feature test. Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20190802105709.27696-2-npiggin@gmail.com --- diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 520804351601..515ea0243ff2 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1026,9 +1026,8 @@ TRAMP_REAL_BEGIN(machine_check_pSeries) .globl machine_check_fwnmi machine_check_fwnmi: EXCEPTION_PROLOG_0 PACA_EXMC -BEGIN_FTR_SECTION b machine_check_common_early -END_FTR_SECTION_IFCLR(CPU_FTR_HVMODE) + machine_check_pSeries_0: EXCEPTION_PROLOG_1 EXC_STD, PACA_EXMC, 1, 0x200, 1, 1, 0 /*