ARM: 7784/1: mm: ensure SMP alternates assemble to exactly 4 bytes with Thumb-2
authorWill Deacon <will.deacon@arm.com>
Mon, 15 Jul 2013 13:26:19 +0000 (14:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 22 Jul 2013 13:29:09 +0000 (14:29 +0100)
commitbf3f0f332f76a85ff3a0b393aaded5a8533769c0
treec2af37fb279885a29863ec1da7980f16976e8f21
parentb6992fa9a74862c5addb62cde1657c7479615d86
ARM: 7784/1: mm: ensure SMP alternates assemble to exactly 4 bytes with Thumb-2

Commit ae8a8b9553bd ("ARM: 7691/1: mm: kill unused TLB_CAN_READ_FROM_L1_CACHE
and use ALT_SMP instead") added early function returns for page table
cache flushing operations on ARMv7 SMP CPUs.

Unfortunately, when targetting Thumb-2, these `mov pc, lr' sequences
assemble to 2 bytes which can lead to corruption of the instruction
stream after code patching.

This patch fixes the alternates to use wide (32-bit) instructions for
Thumb-2, therefore ensuring that the patching code works correctly.

Cc: <stable@vger.kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/proc-v7-2level.S
arch/arm/mm/proc-v7-3level.S
arch/arm/mm/proc-v7.S