diff options
| author | Helge Deller <deller@gmx.de> | 2013-11-17 22:03:11 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-11-19 23:36:16 +0100 |
| commit | 9af63aedb84c4281cde1610280246f7749c27799 (patch) | |
| tree | dde2e68264739ba40a02384af5c3dcedff84538d /arch/parisc | |
| parent | a0ffa8f06f77a6197405521324501614d281bee1 (diff) | |
| download | linux-9af63aedb84c4281cde1610280246f7749c27799.tar.bz2 | |
parisc: do not inline pa_memcpy() internal functions
gcc (4.8.x) creates wrong code when the pa_memcpy() functions are
inlined. Especially in 32bit builds it calculates wrong return values
if we encounter a fault during execution of the memcpy.
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/lib/memcpy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index b5507ec06b84..6c5b5d35bfc0 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c @@ -161,7 +161,7 @@ static inline void prefetch_dst(const void *addr) /* Copy from a not-aligned src to an aligned dst, using shifts. Handles 4 words * per loop. This code is derived from glibc. */ -static inline unsigned long copy_dstaligned(unsigned long dst, +static noinline unsigned long copy_dstaligned(unsigned long dst, unsigned long src, unsigned long len) { /* gcc complains that a2 and a3 may be uninitialized, but actually @@ -276,7 +276,7 @@ handle_store_error: /* Returns PA_MEMCPY_OK, PA_MEMCPY_LOAD_ERROR or PA_MEMCPY_STORE_ERROR. * In case of an access fault the faulty address can be read from the per_cpu * exception data struct. */ -static unsigned long pa_memcpy_internal(void *dstp, const void *srcp, +static noinline unsigned long pa_memcpy_internal(void *dstp, const void *srcp, unsigned long len) { register unsigned long src, dst, t1, t2, t3; |