diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-15 12:44:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-15 12:44:59 -0700 |
| commit | 418702b91073ed0dae774189f69b335cbc92f84d (patch) | |
| tree | b4d8ce540ec8baf9ac3f7c9a68bc7346c606ff74 | |
| parent | 30db202e54d251e4887935f7b4538b44911bb091 (diff) | |
| parent | 1bc944cee663f232e3c37b15a6b2f9185bca413c (diff) | |
| download | blackbird-obmc-linux-418702b91073ed0dae774189f69b335cbc92f84d.tar.gz blackbird-obmc-linux-418702b91073ed0dae774189f69b335cbc92f84d.zip | |
Merge tag 'powerpc-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman:
"Just one fix, for the handling of alignment interrupts on dcbz
instructions.
Thanks to Paul Mackerras, Christian Zigotzky, Michal Sojka"
* tag 'powerpc-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc: Fix handling of alignment interrupt on dcbz instruction
| -rw-r--r-- | arch/powerpc/kernel/align.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c index 26b9994d27ee..43ef25156480 100644 --- a/arch/powerpc/kernel/align.c +++ b/arch/powerpc/kernel/align.c @@ -341,7 +341,7 @@ int fix_alignment(struct pt_regs *regs) type = op.type & INSTR_TYPE_MASK; if (!OP_IS_LOAD_STORE(type)) { - if (type != CACHEOP + DCBZ) + if (op.type != CACHEOP + DCBZ) return -EINVAL; PPC_WARN_ALIGNMENT(dcbz, regs); r = emulate_dcbz(op.ea, regs); |
