fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / parisc / lib / memcpy.c

diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index 20ec355..5575e41 100644 (file)
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -53,7 +53,6 @@
  */
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/compiler.h>
 #include <asm/uaccess.h>
@@ -111,7 +110,7 @@ DECLARE_PER_CPU(struct exception_data, exception_data);
        "\t" EXC_WORD "\t" #_e "\n"                     \
        "\t.previous\n"                                 \
        : _tt(_t), "+r"(_a)                             \
-       : "1"(_a)                                       \
+       :                                               \
        : "r8")
 
 #define def_store_ai_insn(_insn,_sz,_tt,_s,_a,_t,_e)   \
@@ -122,7 +121,7 @@ DECLARE_PER_CPU(struct exception_data, exception_data);
        "\t" EXC_WORD "\t" #_e "\n"                     \
        "\t.previous\n"                                 \
        : "+r"(_a)                                      \
-       : _tt(_t), "0"(_a)                              \
+       : _tt(_t)                                       \
        : "r8")
 
 #define ldbma(_s, _a, _t, _e) def_load_ai_insn(ldbs,1,"=r",_s,_a,_t,_e)
@@ -297,7 +296,7 @@ handle_store_error:
 unsigned long pa_memcpy(void *dstp, const void *srcp, unsigned long len)
 {
        register unsigned long src, dst, t1, t2, t3;
-       register char *pcs, *pcd;
+       register unsigned char *pcs, *pcd;
        register unsigned int *pws, *pwd;
        register double *pds, *pdd;
        unsigned long ret = 0;
@@ -339,6 +338,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 +366,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;