diff options
| author | Russell King | 2015-07-03 16:22:54 +0200 |
|---|---|---|
| committer | Russell King | 2015-07-03 21:46:15 +0200 |
| commit | 1bd46782d08b01b73df0085b51ea1021b19b44fd (patch) | |
| tree | 12f984aae768b67a6406e5e076f0ba17badc11d7 /arch/arm/lib | |
| parent | ARM: pgtable: document mapping types (diff) | |
| download | kernel-qcow2-linux-1bd46782d08b01b73df0085b51ea1021b19b44fd.tar.gz kernel-qcow2-linux-1bd46782d08b01b73df0085b51ea1021b19b44fd.tar.xz kernel-qcow2-linux-1bd46782d08b01b73df0085b51ea1021b19b44fd.zip | |
ARM: avoid unwanted GCC memset()/memcpy() optimisations for IO variants
We don't want GCC optimising our memset_io(), memcpy_fromio() or
memcpy_toio() variants, so we must not call one of the standard
functions. Provide a separate name for our assembly memcpy() and
memset() functions, and use that instead, thereby bypassing GCC's
ability to optimise these operations.
GCCs optimisation may introduce unaligned accesses which are invalid
for device mappings.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/memcpy.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/memset.S | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index 7797e81e40e0..64111bd4440b 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -61,8 +61,10 @@ /* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ +ENTRY(mmiocpy) ENTRY(memcpy) #include "copy_template.S" ENDPROC(memcpy) +ENDPROC(mmiocpy) diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index a4ee97b5a2bf..3c65e3bd790f 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -16,6 +16,7 @@ .text .align 5 +ENTRY(mmioset) ENTRY(memset) UNWIND( .fnstart ) ands r3, r0, #3 @ 1 unaligned? @@ -133,3 +134,4 @@ UNWIND( .fnstart ) b 1b UNWIND( .fnend ) ENDPROC(memset) +ENDPROC(mmioset) |