From ddc6cd0d70a6f958b2c01758ee53279d36db2234 Mon Sep 17 00:00:00 2001 From: Christophe Leroy Date: Tue, 17 May 2016 14:01:39 +0200 Subject: powerpc32: Use instruction symbolic names in check_io_access() Signed-off-by: Christophe Leroy Signed-off-by: Scott Wood --- arch/powerpc/kernel/traps.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'arch/powerpc/kernel') diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 6b108ed29c20..68f8b5b0d885 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -352,12 +352,11 @@ static inline int check_io_access(struct pt_regs *regs) * For the debug message, we look at the preceding * load or store. */ - if (*nip == 0x60000000) /* nop */ + if (*nip == PPC_INST_NOP) nip -= 2; - else if (*nip == 0x4c00012c) /* isync */ + else if (*nip == PPC_INST_ISYNC) --nip; - if (*nip == 0x7c0004ac || (*nip >> 26) == 3) { - /* sync or twi */ + if (*nip == PPC_INST_SYNC || (*nip >> 26) == OP_TRAP) { unsigned int rb; --nip; -- cgit v1.2.3