Date: Sun, 29 Sep 1996 06:13:17 -0700 (PDT) From: Peter Wemm <peter> To: freebsd-smp Subject: cvs commit: sys/i386/conf files.i386 options.i386 sys/scsi sd.c sys/sys kernel.h proc.h sys/i386/i386 db_interface.c identcpu.c machdep.c pmap.c support.s swtch.s trap.c sys/i386/include cpufunc.h segments.h sys/i386/isa clock.c npx.c random_machdep.c sio.c sys/kern init_main.c kern_exit.c kern_ktrace.c kern_shutdown.c kern_synch.c vfs_bio.c sys/vm vm_glue.c Message-ID: <199609291313.GAA21409@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/09/29 06:13:16
Modified: i386/conf files.i386 options.i386
i386/i386 db_interface.c identcpu.c machdep.c pmap.c
support.s swtch.s trap.c
i386/include cpufunc.h segments.h
i386/isa clock.c npx.c random_machdep.c sio.c
kern init_main.c kern_exit.c kern_ktrace.c
kern_shutdown.c kern_synch.c vfs_bio.c
scsi sd.c
sys kernel.h proc.h
vm vm_glue.c
Log:
Merge in changes from -current that conflicted with something
Revision Changes Path
1.8 +2 -2 sys/i386/conf/files.i386
1.6 +12 -2 sys/i386/conf/options.i386
1.5 +3 -3 sys/i386/i386/db_interface.c
1.3 +1 -15 sys/i386/i386/identcpu.c
1.23 +11 -23 sys/i386/i386/machdep.c
1.20 +650 -337 sys/i386/i386/pmap.c
1.12 +37 -29 sys/i386/i386/support.s
1.23 +2 -2 sys/i386/i386/swtch.s
1.13 +3 -3 sys/i386/i386/trap.c
1.10 +20 -56 sys/i386/include/cpufunc.h
1.3 +3 -2 sys/i386/include/segments.h
1.3 +8 -6 sys/i386/isa/clock.c
1.5 +1 -30 sys/i386/isa/npx.c
1.3 +30 -1 sys/i386/isa/random_machdep.c
1.5 +2 -65 sys/i386/isa/sio.c
1.23 +9 -1 sys/kern/init_main.c
1.8 +3 -3 sys/kern/kern_exit.c
1.5 +36 -1 sys/kern/kern_ktrace.c
1.5 +4 -8 sys/kern/kern_shutdown.c
1.11 +2 -7 sys/kern/kern_synch.c
1.9 +96 -27 sys/kern/vfs_bio.c
1.7 +3 -26 sys/scsi/sd.c
1.8 +2 -3 sys/sys/kernel.h
1.12 +3 -3 sys/sys/proc.h
1.10 +1 -38 sys/vm/vm_glue.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199609291313.GAA21409>