selftests/powerpc: Import Anton's memcpy / copy_tofrom_user tests

[linux-2.6-block.git] / arch / powerpc / lib / memcpy_64.S

diff --git a/arch/powerpc/lib/memcpy_64.S b/arch/powerpc/lib/memcpy_64.S
index d2bbbc8d7dc0b045aab751d79264a2f4f959fe61..72ad055168a333ed31ebd5c0c014ff00f6c7436a 100644 (file)
--- a/arch/powerpc/lib/memcpy_64.S
+++ b/arch/powerpc/lib/memcpy_64.S
@@ -14,7 +14,9 @@ _GLOBAL(memcpy)
 BEGIN_FTR_SECTION
        std     r3,48(r1)       /* save destination pointer for return value */
 FTR_SECTION_ELSE
+#ifndef SELFTEST
        b       memcpy_power7
+#endif
 ALT_FTR_SECTION_END_IFCLR(CPU_FTR_VMX_COPY)
        PPC_MTOCRF(0x01,r5)
        cmpldi  cr1,r5,16