diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /arch/arm/lib/memcpy.S | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'arch/arm/lib/memcpy.S')
| -rw-r--r-- | arch/arm/lib/memcpy.S | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index ae5307d4b..e652b5276 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -1,10 +1,13 @@ /* - * linux/arch/arm/lib/memcpy.S + * linux/arch/arm/lib/memcpy.S * - * Copyright (C) 1995-1999 Russell King + * Copyright (C) 1995-1999 Russell King * - * ASM optimised string functions + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * + * ASM optimised string functions */ #include <linux/linkage.h> #include <asm/assembler.h> @@ -314,5 +317,3 @@ ENTRY(memmove) b 24b .align - - |