summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/exceptions-64s.S
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2019-08-02 12:56:26 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2019-08-30 02:32:34 +0200
commit0be9f7fd5d8fd984b34ad98838ef7cfd0079ddae (patch)
tree0a6a5992d213c3ee64565eb7b7e054b3172c4ebb /arch/powerpc/kernel/exceptions-64s.S
parentpowerpc/configs: Enable secure guest support in pseries and ppc64 defconfigs (diff)
downloadlinux-0be9f7fd5d8fd984b34ad98838ef7cfd0079ddae.tar.xz
linux-0be9f7fd5d8fd984b34ad98838ef7cfd0079ddae.zip
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 <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20190802105709.27696-2-npiggin@gmail.com
Diffstat (limited to '')
-rw-r--r--arch/powerpc/kernel/exceptions-64s.S3
1 files changed, 1 insertions, 2 deletions
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
/*