Date: Wed, 20 Nov 1996 20:16:07 -0800 (PST) From: Peter Wemm <peter> To: freebsd-smp Subject: cvs commit: sys/i386/boot/biosboot asm.h sys/net rtsock.c sys/sys kernel.h proc.h sys/ufs/ufs ufs_inode.c sys/ddb db_trap.c sys/i386/i386 autoconf.c machdep.c pmap.c support.s sys/i386/include ipl.h pcb.h segments.h sys/i386/isa icu.h icu.s if_ed.c if_ze.c isa_device.h npx.c pcibus.c sio.c sys/kern init_main.c subr_prf.c sys/pci pci.c pcibus.h sys/scsi scsi_ioctl.c sd.c Message-ID: <199611210416.UAA03553@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/11/20 20:16:03
Modified: ddb db_trap.c
i386/boot/biosboot asm.h
i386/i386 autoconf.c machdep.c pmap.c support.s
i386/include ipl.h pcb.h segments.h
i386/isa icu.h icu.s if_ed.c if_ze.c isa_device.h npx.c
pcibus.c sio.c
kern init_main.c subr_prf.c
net rtsock.c
pci pci.c pcibus.h
scsi scsi_ioctl.c sd.c
sys kernel.h proc.h
ufs/ufs ufs_inode.c
Log:
Attempt to minimise unnecessary differences with -current (eg: whitespace,
add/remove blank lines, defunct code, etc) to try and make future merges
go a bit easier.
It compiles now, but icu.s and vector.s has some unresolved merge problems.
(ie: there have been changes in -current which are applicable to all three
(or four?) sets of duplicated INTR macros, but the merge only did one of
them, and probably the wrong one. Steve needs to look more closely at
the effects of this)
Revision Changes Path
1.3 +0 -1 sys/ddb/db_trap.c
1.4 +39 -0 sys/i386/boot/biosboot/asm.h
1.8 +5 -0 sys/i386/i386/autoconf.c
1.29 +49 -50 sys/i386/i386/machdep.c
1.29 +2 -2 sys/i386/i386/pmap.c
1.14 +21 -21 sys/i386/i386/support.s
1.5 +1 -2 sys/i386/include/ipl.h
1.10 +2 -3 sys/i386/include/pcb.h
1.4 +1 -1 sys/i386/include/segments.h
1.7 +1 -1 sys/i386/isa/icu.h
1.16 +7 -1 sys/i386/isa/icu.s
1.4 +0 -4 sys/i386/isa/if_ed.c
1.6 +1 -1 sys/i386/isa/if_ze.c
1.5 +1 -2 sys/i386/isa/isa_device.h
1.12 +2 -1 sys/i386/isa/npx.c
1.6 +0 -1 sys/i386/isa/pcibus.c
1.11 +1 -1 sys/i386/isa/sio.c
1.31 +0 -33 sys/kern/init_main.c
1.9 +0 -2 sys/kern/subr_prf.c
1.4 +1 -3 sys/net/rtsock.c
1.6 +0 -2 sys/pci/pci.c
1.5 +1 -2 sys/pci/pcibus.h
1.4 +0 -2 sys/scsi/scsi_ioctl.c
1.8 +0 -1 sys/scsi/sd.c
1.12 +1 -1 sys/sys/kernel.h
1.16 +2 -4 sys/sys/proc.h
1.3 +0 -4 sys/ufs/ufs/ufs_inode.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199611210416.UAA03553>