Date: Fri, 26 Jul 1996 16:28:38 -0700 (PDT) From: Peter Wemm <peter> To: freebsd-smp Subject: cvs commit: sys/i386/boot/biosboot asm.h sys/i386/conf files.i386 options.i386 sys/i386/i386 exception.s locore.s machdep.c microtime.s pmap.c support.s swtch.s trap.c sys/i386/include cpu.h cpufunc.h spl.h sys/net rtsock.c sys/sys kernel.h proc.h sys/i386/isa icu.s npx.c sio.c vector.s sys/kern init_main.c kern_exit.c kern_fork.c kern_sig.c vfs_bio.c sys/scsi scsi_ioctl.c sd.c sys/vm vm_glue.c Message-ID: <199607262328.QAA13753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/07/26 16:28:38
Modified: i386/boot/biosboot asm.h
i386/conf files.i386 options.i386
i386/i386 exception.s locore.s machdep.c microtime.s pmap.c
support.s swtch.s trap.c
i386/include cpu.h cpufunc.h spl.h
i386/isa icu.s npx.c sio.c vector.s
kern init_main.c kern_exit.c kern_fork.c kern_sig.c
vfs_bio.c
net rtsock.c
scsi scsi_ioctl.c sd.c
sys kernel.h proc.h
vm vm_glue.c
Log:
First pass at conflict resolution from -current merge. I would be suprised
if I didn't miss something.. Beware!
Revision Changes Path
1.3 +1 -1 sys/i386/boot/biosboot/asm.h
1.5 +4 -1 sys/i386/conf/files.i386
1.5 +5 -1 sys/i386/conf/options.i386
1.9 +7 -6 sys/i386/i386/exception.s
1.23 +35 -35 sys/i386/i386/locore.s
1.20 +12 -201 sys/i386/i386/machdep.c
1.4 +103 -95 sys/i386/i386/microtime.s
1.17 +741 -552 sys/i386/i386/pmap.c
1.11 +211 -21 sys/i386/i386/support.s
1.20 +1 -43 sys/i386/i386/swtch.s
1.11 +19 -19 sys/i386/i386/trap.c
1.8 +6 -4 sys/i386/include/cpu.h
1.8 +58 -20 sys/i386/include/cpufunc.h
1.4 +11 -3 sys/i386/include/spl.h
1.10 +2 -2 sys/i386/isa/icu.s
1.4 +2 -1 sys/i386/isa/npx.c
1.4 +16 -37 sys/i386/isa/sio.c
1.12 +40 -40 sys/i386/isa/vector.s
1.17 +9 -2 sys/kern/init_main.c
1.4 +1 -2 sys/kern/kern_exit.c
1.5 +1 -2 sys/kern/kern_fork.c
1.5 +6 -5 sys/kern/kern_sig.c
1.6 +10 -3 sys/kern/vfs_bio.c
1.3 +3 -3 sys/net/rtsock.c
1.3 +2 -1 sys/scsi/scsi_ioctl.c
1.4 +43 -13 sys/scsi/sd.c
1.6 +2 -1 sys/sys/kernel.h
1.9 +2 -1 sys/sys/proc.h
1.9 +6 -19 sys/vm/vm_glue.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199607262328.QAA13753>