Menu
▾
▴
[LV-k25-commit] kernel-2.5/arch/vax/lib checksum.c,1.2,1.3 clear_user.S,1.6,1.7 copy_tofrom_user.S,1.6,1.7 negdi.c,1.4,1.5 string.c,1.6,1.7 string_user.c,1.4,1.5 strncpy_user.S,1.7,1.8 strnlen_user.S,1.6,1.7
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-25 22:25:30
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30232/arch/vax/lib Modified Files: checksum.c clear_user.S copy_tofrom_user.S negdi.c string.c string_user.c strncpy_user.S strnlen_user.S Log Message: - Removal of $Id$ - Touchup for ptrace.c -- there's probably another round needed, tough... Index: string.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/string.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- string.c 3 Mar 2004 20:18:35 -0000 1.6 +++ string.c 25 Apr 2005 22:25:05 -0000 1.7 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 1991, 1992 Linus Torvalds */ @@ -10,12 +8,9 @@ * often) or if speed doesn't matter (overhead of a function call), * just drop them here. */ - #include <linux/string.h> - - -void * memset(void * s, int c , __kernel_size_t count) +void *memset(void *s, int c , __kernel_size_t count) { asm ( " movl %2, %%r6 \n" /* R6 holds bytes left */ @@ -30,7 +25,7 @@ "last_chunk: \n" " movc5 $0, 0, %1, %%r6, (%%r3) " : /* no outputs */ - : "g" (s), "g" (c), "g" (count) + : "g"(s), "g"(c), "g"(count) : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7"); return s; Index: strncpy_user.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/strncpy_user.S,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- strncpy_user.S 15 Jun 2003 22:33:56 -0000 1.7 +++ strncpy_user.S 25 Apr 2005 22:25:05 -0000 1.8 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001, Dave Airlie * * VAX Assembly implementation of strncpy_from_user @@ -9,8 +7,8 @@ #include <asm/errno.h> #include <linux/linkage.h> -/* int __strncpy_from_user(char *dst, const char *src, long count) - * Returns number of bytes copied +/* int __strncpy_from_user(char *dst, const char *src, long count) + * Returns number of bytes copied */ #define EX(insn, addr, reg, handler) \ @@ -18,8 +16,8 @@ .section __ex_table, "a"; \ .align 2 ; \ .long 9b, handler; \ - .previous - + .previous + .text ENTRY(__strncpy_from_user) .word 0x3e @@ -35,7 +33,8 @@ sobgtr %r1, 1b 2: subl2 %r1, %r0 ret - .section .fixup, "ax" + .section .fixup, "ax" fault: movl $-EFAULT, %r0 ret .previous + Index: strnlen_user.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/strnlen_user.S,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- strnlen_user.S 15 Jun 2003 22:33:56 -0000 1.6 +++ strnlen_user.S 25 Apr 2005 22:25:05 -0000 1.7 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001, Dave Airlie * * VAX Assembly implementation of strnlen @@ -18,14 +16,14 @@ .align 2 ; \ .long 9b, handler; \ .previous - + .text ENTRY(__strnlen_user) .word 0x3e movl 4(%ap), %r0 movl 8(%ap), %r1 movl %r0, %r2 - + 1: EX(movb, (%r0)+, %r3, fault) cmpb $0, %r3 beql 2f @@ -33,7 +31,8 @@ incl %r0 2: subl2 %r2, %r0 ret - + .section .fixup,"ax" fault: movl $0, %r0 ret + Index: negdi.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/negdi.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- negdi.c 20 May 2002 00:33:33 -0000 1.4 +++ negdi.c 25 Apr 2005 22:25:05 -0000 1.5 @@ -1,8 +1,6 @@ /* - * $Id$ - * * Copyright (C) 2001, Kenn Humborg - * + * * This is a temporary implementation of GCCs negdi2 primitive. * Once we get native support in the compiler, this will be * removed from here @@ -21,3 +19,4 @@ return x; } + Index: checksum.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/checksum.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- checksum.c 1 Oct 2003 00:15:12 -0000 1.2 +++ checksum.c 25 Apr 2005 22:25:05 -0000 1.3 @@ -1,18 +1,15 @@ /* - * $Id$ - * * Dave Airlie wrote the original IP checksum code for Linux/VAX * in assembler (transliterating from the i386 version). * * In 2.5.69, the NFS client code was changed to use zero-copy * which leads to this function being called with odd-byte-aligned * buffers, which broke Dave's code. - * + * * While fixing this, I re-wrote it in C, only using assembler for * the carry-handling that is impossible to do in C. Some inspiration * came from NetBSD :-) The generated looks as good as Dave's. * - Kenn Humborg, 2003-10-01 - * */ #include <asm/checksum.h> @@ -146,8 +143,10 @@ } if (odd) { - /* Need to byte-swap - just roll everything around - through 8 bits */ + /* + * Need to byte-swap - just roll everything around + *through 8 bits. + */ __asm__ __volatile ( "rotl $8, %0, %0 " : "=r" (sum) Index: clear_user.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/clear_user.S,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- clear_user.S 15 Jun 2003 22:33:56 -0000 1.6 +++ clear_user.S 25 Apr 2005 22:25:05 -0000 1.7 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001, Dave Airlie * * VAX Assembly implementation of clear_user @@ -9,7 +7,7 @@ #include <asm/errno.h> #include <linux/linkage.h> -/* unsigned long __clear_user(void *addr, unsigned long size); +/* unsigned long __clear_user(void *addr, unsigned long size); * number of bytes not cleared is returned */ @@ -18,7 +16,7 @@ .section __ex_table, "a"; \ .align 2 ; \ .long 9b, handler; \ - .previous + .previous .text ENTRY(__clear_user) @@ -33,3 +31,4 @@ .section .fixup, "ax" fault: ret .previous + Index: copy_tofrom_user.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/copy_tofrom_user.S,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- copy_tofrom_user.S 15 Jun 2003 22:33:56 -0000 1.6 +++ copy_tofrom_user.S 25 Apr 2005 22:25:05 -0000 1.7 @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001, Dave Airlie * * VAX Assembly implementation of copy_tofrom_user @@ -18,7 +16,7 @@ .align 2 ; \ .long 9b, handler; \ .previous - + .text ENTRY(__copy_tofrom_user) .word 0x3e @@ -32,6 +30,6 @@ ret .section .fixup,"ax" .align 4 -l_fixup: +l_fixup: s_fixup: ret .previous Index: string_user.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/lib/string_user.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- string_user.c 20 May 2002 00:33:33 -0000 1.4 +++ string_user.c 25 Apr 2005 22:25:05 -0000 1.5 @@ -1,13 +1,10 @@ /* - * $Id$ + * Copyright (C) 2001, Kenn Humborg * - * Copyright (C) 2001, Kenn Humborg - * - * These functions are used to do string operations on user memory + * These functions are used to do string operations on user memory */ #include <linux/string.h> - #include <linux/kernel.h> /* for panic() */ unsigned long __clear_user(void *addr, unsigned long size) |
