ARM: 7670/1: fix the memset fix

commit 418df63adac56841ef6b0f1fcf435bc64d4ed177 upstream.

Commit 455bd4c430b0 ("ARM: 7668/1: fix memset-related crashes caused by
recent GCC (4.7.2) optimizations") attempted to fix a compliance issue
with the memset return value.  However the memset itself became broken
by that patch for misaligned pointers.

This fixes the above by branching over the entry code from the
misaligned fixup code to avoid reloading the original pointer.

Also, because the function entry alignment is wrong in the Thumb mode
compilation, that fixup code is moved to the end.

While at it, the entry instructions are slightly reworked to help dual
issue pipelines.

Change-Id: I192ba7e52fdbc46820156f959c4b2073572d6220
Signed-off-by: Nicolas Pitre <>
Tested-by: Alexander Holler <>
Signed-off-by: Russell King <>
Cc: Eric BĂ©nard <>
Signed-off-by: Greg Kroah-Hartman <>

1 file changed