Date: Sat, 10 Aug 1996 02:08:42 -0700 (PDT) From: Peter Wemm <peter> To: freebsd-smp Subject: cvs commit: sys/i386/i386 genassym.c microtime.s pmap.c swtch.s sys/i386/include cpufunc.h pcb.h sys/scsi sd.c sys/kern init_main.c kern_exit.c kern_fork.c kern_ktrace.c kern_synch.c vfs_bio.c sys/sys proc.h Message-ID: <199608100908.CAA25008@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/08/10 02:08:41
Modified: i386/i386 genassym.c microtime.s pmap.c swtch.s
i386/include cpufunc.h pcb.h
kern init_main.c kern_exit.c kern_fork.c kern_ktrace.c
kern_synch.c vfs_bio.c
scsi sd.c
sys proc.h
Log:
Merge -current conflicts
(I imported a new -current, but the commit message was bigger than
majordomo's 40K limit, so the message bounced)
Revision Changes Path
1.4 +3 -4 sys/i386/i386/genassym.c
1.7 +4 -6 sys/i386/i386/microtime.s
1.18 +1 -1 sys/i386/i386/pmap.c
1.21 +5 -24 sys/i386/i386/swtch.s
1.9 +12 -1 sys/i386/include/cpufunc.h
1.8 +1 -2 sys/i386/include/pcb.h
1.19 +6 -1 sys/kern/init_main.c
1.5 +1 -1 sys/kern/kern_exit.c
1.6 +1 -2 sys/kern/kern_fork.c
1.4 +12 -12 sys/kern/kern_ktrace.c
1.8 +71 -110 sys/kern/kern_synch.c
1.7 +4 -4 sys/kern/vfs_bio.c
1.5 +3 -3 sys/scsi/sd.c
1.10 +4 -3 sys/sys/proc.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199608100908.CAA25008>