diff options
Diffstat (limited to 'arch/parisc/lib')
-rw-r--r-- | arch/parisc/lib/fixup.S | 4 | ||||
-rw-r--r-- | arch/parisc/lib/memcpy.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index 1b91612ed964..e0661c2978ed 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S | |||
@@ -35,7 +35,7 @@ | |||
35 | extrd,u \t2,63,32,\t2 | 35 | extrd,u \t2,63,32,\t2 |
36 | #endif | 36 | #endif |
37 | /* t2 = &__per_cpu_offset[smp_processor_id()]; */ | 37 | /* t2 = &__per_cpu_offset[smp_processor_id()]; */ |
38 | LDREG,s \t2(\t1),\t2 | 38 | LDREGX \t2(\t1),\t2 |
39 | addil LT%per_cpu__exception_data,%r27 | 39 | addil LT%per_cpu__exception_data,%r27 |
40 | LDREG RT%per_cpu__exception_data(%r1),\t1 | 40 | LDREG RT%per_cpu__exception_data(%r1),\t1 |
41 | /* t1 = &__get_cpu_var(exception_data) */ | 41 | /* t1 = &__get_cpu_var(exception_data) */ |
@@ -53,6 +53,8 @@ | |||
53 | .endm | 53 | .endm |
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | .level LEVEL | ||
57 | |||
56 | .text | 58 | .text |
57 | .section .fixup, "ax" | 59 | .section .fixup, "ax" |
58 | 60 | ||
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c index feb1b9f42c2b..b7098035321f 100644 --- a/arch/parisc/lib/memcpy.c +++ b/arch/parisc/lib/memcpy.c | |||
@@ -339,6 +339,7 @@ unsigned long pa_memcpy(void *dstp, const void *srcp, unsigned long len) | |||
339 | pds = (double *)pcs; | 339 | pds = (double *)pcs; |
340 | pdd = (double *)pcd; | 340 | pdd = (double *)pcd; |
341 | 341 | ||
342 | #if 0 | ||
342 | /* Copy 8 doubles at a time */ | 343 | /* Copy 8 doubles at a time */ |
343 | while (len >= 8*sizeof(double)) { | 344 | while (len >= 8*sizeof(double)) { |
344 | register double r1, r2, r3, r4, r5, r6, r7, r8; | 345 | register double r1, r2, r3, r4, r5, r6, r7, r8; |
@@ -366,6 +367,7 @@ unsigned long pa_memcpy(void *dstp, const void *srcp, unsigned long len) | |||
366 | fstdma(d_space, r8, pdd, pmc_store_exc); | 367 | fstdma(d_space, r8, pdd, pmc_store_exc); |
367 | len -= 8*sizeof(double); | 368 | len -= 8*sizeof(double); |
368 | } | 369 | } |
370 | #endif | ||
369 | 371 | ||
370 | pws = (unsigned int *)pds; | 372 | pws = (unsigned int *)pds; |
371 | pwd = (unsigned int *)pdd; | 373 | pwd = (unsigned int *)pdd; |