diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2016-05-17 14:01:39 +0200 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2016-09-24 23:51:06 -0500 |
| commit | ddc6cd0d70a6f958b2c01758ee53279d36db2234 (patch) | |
| tree | 943550d7127cf19a93f23ad7cf7b494a0d2f76e5 /arch/powerpc/kernel/traps.c | |
| parent | 5066943a5170838e58e07163d32ba45b0b360417 (diff) | |
| download | lwn-ddc6cd0d70a6f958b2c01758ee53279d36db2234.tar.gz lwn-ddc6cd0d70a6f958b2c01758ee53279d36db2234.zip | |
powerpc32: Use instruction symbolic names in check_io_access()
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; |