Module Name:	syssrc
Committed By:	sommerfeld
Date:		Sun Jan  7 22:59:26 UTC 2001

Modified Files:
	syssrc/sys/arch/i386/i386 [sommerfeld_i386mp_1]: autoconf.c cpu.c
	    db_memrw.c gdt.c locore.s machdep.c pmap.c svr4_sigcode.s trap.c
	    vm_machdep.c
	syssrc/sys/arch/i386/include [sommerfeld_i386mp_1]: cpu.h gdt.h

Log Message:
Correct merge botches.
Post-merge kernel now boots multiuser.


To generate a diff of this commit:
cvs rdiff -r1.45.2.6 -r1.45.2.7 syssrc/sys/arch/i386/i386/autoconf.c
cvs rdiff -r1.1.2.17 -r1.1.2.18 syssrc/sys/arch/i386/i386/cpu.c
cvs rdiff -r1.8.2.2 -r1.8.2.3 syssrc/sys/arch/i386/i386/db_memrw.c
cvs rdiff -r1.22.2.2 -r1.22.2.3 syssrc/sys/arch/i386/i386/gdt.c
cvs rdiff -r1.215.2.18 -r1.215.2.19 syssrc/sys/arch/i386/i386/locore.s
cvs rdiff -r1.376.2.13 -r1.376.2.14 syssrc/sys/arch/i386/i386/machdep.c
cvs rdiff -r1.83.2.25 -r1.83.2.26 syssrc/sys/arch/i386/i386/pmap.c
cvs rdiff -r1.1.4.1 -r1.1.4.2 syssrc/sys/arch/i386/i386/svr4_sigcode.s
cvs rdiff -r1.134.2.11 -r1.134.2.12 syssrc/sys/arch/i386/i386/trap.c
cvs rdiff -r1.86.2.12 -r1.86.2.13 syssrc/sys/arch/i386/i386/vm_machdep.c
cvs rdiff -r1.59.2.17 -r1.59.2.18 syssrc/sys/arch/i386/include/cpu.h
cvs rdiff -r1.7.10.2 -r1.7.10.3 syssrc/sys/arch/i386/include/gdt.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.