Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 418702b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 30db202e 1bc944ce

arch/powerpc/kernel/align.c

+1 −1
Original line number Diff line number Diff line
@@ -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);