On Sat, May 6, 2017 at 9:42 AM, Ard Biesheuvel
<ard.biesheuvel@xxxxxxxxxx> wrote:
> On 5 May 2017 at 20:47, Arnd Bergmann <arnd@xxxxxxxx> wrote:
>> From: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
>>
>> Commit 69bbf2ab20389418327484288d8730732e4f3dd0 upstream.
>>
>> Two files that get included when building the multi_v7_defconfig target
>> fail to build when selecting THUMB2_KERNEL for this configuration.
>>
>> In both cases, we can just build the file as ARM code, as none of its
>> symbols are exported to modules, so there are no interworking concerns.
>> In the iwmmxt.S case, add ENDPROC() declarations so the symbols are
>> annotated as functions, resulting in the linker to emit the appropriate
>> mode switches.
>>
>> Acked-by: Nicolas Pitre <nico@xxxxxxxxxx>
>> Tested-by: Olof Johansson <olof@xxxxxxxxx>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
>> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
>> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
>
> I think you will want to take 5008efc83bf85b647aa1cbc44718b1675bbb7444
> as well. This patch by itself caused problems with ftrace's
> instruction patching IIRC.
Right, thanks for the reminder. As the original patch was already in 3.18
and 4.4, but the second one was not, I have also submitted 5008efc83bf85
for inclusion in those two stable series now, besides adding it to
my local series here.
Arnd