]> git.baikalelectronics.ru Git - kernel.git/commit
MIPS: CPS: Stop dangling delay slot from has_mt.
authorPaul Burton <paul.burton@imgtec.com>
Wed, 5 Aug 2015 22:42:36 +0000 (15:42 -0700)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 30 Sep 2015 16:15:29 +0000 (18:15 +0200)
commitb39e9cb0ae9126c35a1388e79fdf485ab10121eb
tree1c0a2933729316f1dee3292a78fb0964ca14faca
parent78feb8f3b2793b2f846fc8fabab552869eba3d40
MIPS: CPS: Stop dangling delay slot from has_mt.

The has_mt macro ended with a branch, leaving its callers with a delay
slot that would be executed if Config3.MT is not set. However it would
not be executed if Config3 (or earlier Config registers) don't exist
which makes it somewhat inconsistent at best. Fill the delay slot in the
macro & fix the mips_cps_boot_vpes caller appropriately.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: <stable@vger.kernel.org> # 3.16+
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10865/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/cps-vec.S