From: Andy P. <at...@us...> - 2002-04-10 18:38:35
|
Update of /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib In directory usw-pr-cvs1:/tmp/cvs-serv31330/sparc/lib Modified Files: Makefile ashldi3.S ashrdi3.S bitops.S blockops.S debuglocks.c locks.S lshrdi3.S memscan.S memset.S mul.S rem.S rwsem.S sdiv.S strncmp.S udiv.S umul.S urem.S Log Message: synch 2.4.15 commit 45 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: ashldi3.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/ashldi3.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: ashrdi3.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/ashrdi3.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: bitops.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/bitops.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- bitops.S 14 Jan 2001 19:26:08 -0000 1.1.1.1 +++ bitops.S 10 Apr 2002 15:17:42 -0000 1.2 @@ -107,62 +107,5 @@ jmpl %o7, %g0 mov %g4, %o7 - /* Now the little endian versions. */ - .globl ___set_le_bit -___set_le_bit: - rd %psr, %g3 - nop; nop; nop - or %g3, PSR_PIL, %g5 - wr %g5, 0x0, %psr - nop; nop; nop -#ifdef CONFIG_SMP - set C_LABEL(bitops_spinlock), %g5 -2: ldstub [%g5], %g7 ! Spin on the byte lock for SMP. - orcc %g7, 0x0, %g0 ! Did we get it? - bne 2b ! Nope... -#endif - ldub [%g1], %g7 - or %g7, %g2, %g5 - and %g7, %g2, %g2 -#ifdef CONFIG_SMP - stb %g5, [%g1] - set C_LABEL(bitops_spinlock), %g5 - stb %g0, [%g5] -#else - stb %g5, [%g1] -#endif - wr %g3, 0x0, %psr - nop; nop; nop - jmpl %o7, %g0 - mov %g4, %o7 - - .globl ___clear_le_bit -___clear_le_bit: - rd %psr, %g3 - nop; nop; nop - or %g3, PSR_PIL, %g5 - wr %g5, 0x0, %psr - nop; nop; nop -#ifdef CONFIG_SMP - set C_LABEL(bitops_spinlock), %g5 -2: ldstub [%g5], %g7 ! Spin on the byte lock for SMP. - orcc %g7, 0x0, %g0 ! Did we get it? - bne 2b ! Nope... -#endif - ldub [%g1], %g7 - andn %g7, %g2, %g5 - and %g7, %g2, %g2 -#ifdef CONFIG_SMP - stb %g5, [%g1] - set C_LABEL(bitops_spinlock), %g5 - stb %g0, [%g5] -#else - stb %g5, [%g1] -#endif - wr %g3, 0x0, %psr - nop; nop; nop - jmpl %o7, %g0 - mov %g4, %o7 - .globl __bitops_end __bitops_end: Index: blockops.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/blockops.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: debuglocks.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/debuglocks.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- debuglocks.c 14 Jan 2001 19:26:11 -0000 1.1.1.1 +++ debuglocks.c 10 Apr 2002 15:17:42 -0000 1.2 @@ -29,11 +29,9 @@ static inline void show(char *str, spinlock_t *lock, unsigned long caller) { int cpu = smp_processor_id(); - extern spinlock_t console_lock; - if (lock != &console_lock) - printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n",str, - lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3); + printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n",str, + lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3); } static inline void show_read(char *str, rwlock_t *lock, unsigned long caller) Index: locks.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/locks.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: lshrdi3.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/lshrdi3.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: memscan.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/memscan.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: memset.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/memset.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- memset.S 14 Jan 2001 19:26:06 -0000 1.1.1.1 +++ memset.S 10 Apr 2002 15:17:42 -0000 1.2 @@ -188,7 +188,7 @@ b 30f add %o0, %o1, %o0 30: -/* %o4 is faulting address, %o5 is %pc where fault occured */ +/* %o4 is faulting address, %o5 is %pc where fault occurred */ save %sp, -104, %sp mov %i5, %o0 mov %i7, %o1 Index: mul.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/mul.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: rem.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/rem.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: rwsem.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/rwsem.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: sdiv.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/sdiv.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: strncmp.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/strncmp.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: udiv.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/udiv.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: umul.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/umul.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: urem.S =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sparc/lib/urem.S,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 |