Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6

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 @@
         extrd,u \t2,63,32,\t2
 #endif
         /* t2 = &__per_cpu_offset[smp_processor_id()]; */
-        LDREG,s \t2(\t1),\t2 
+        LDREGX \t2(\t1),\t2 
         addil LT%per_cpu__exception_data,%r27
         LDREG RT%per_cpu__exception_data(%r1),\t1
         /* t1 = &__get_cpu_var(exception_data) */
@@ -53,6 +53,8 @@
         .endm
 #endif
 
+        .level LEVEL
+
         .text
         .section .fixup, "ax"
 
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)
         pds = (double *)pcs;
         pdd = (double *)pcd;
 
+#if 0
         /* Copy 8 doubles at a time */
         while (len >= 8*sizeof(double)) {
                 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)
                 fstdma(d_space, r8, pdd, pmc_store_exc);
                 len -= 8*sizeof(double);
         }
+#endif
 
         pws = (unsigned int *)pds;
         pwd = (unsigned int *)pdd;