看板 DFBSD_submit 關於我們 聯絡資訊
On Tue, 21 Dec 2004 23:54:08 +0100 Joerg Sonnenberger <joerg@britannica.bec.de> wrote: > On Tue, Dec 21, 2004 at 12:38:27PM -0800, Chris Pressey wrote: > > I just wanted to pass it over submit@ for one last review. If there > > are no objections in the next few days, I'll commit it: > > > > http://catseye.webhop.net/DragonFlyBSD/patch/kernel_barricade.diff > > [...] > - in bus/cam/scsi_da.c, can you merge the _KERNEL includes and the > !_KERNEL includes? Apparently, not all of them; they seem to have interdependencies and their order of inclusion matters. I'll need to fiddle around with it a bit more to see how much can be merged. > - sys/systimer.h is _KERNEL only, if world break, we should fix it World does break: ===> gnu/usr.bin/binutils/gdb Making init.c yacc -o c-exp.c /usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb/c-exp.y yacc -o f-exp.c /usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb/f-exp.y yacc: 4 rules never reduced yacc -o jv-exp.c /usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb/jv-exp.y yacc -o m2-exp.c /usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb/m2-exp.y rm -f .depend mkdep -f .depend -a -D_GNU_SOURCE -I. -I/usr/src/gnu/usr.bin/binutils/gdb/i386 -I/usr/src/gnu/usr.bin/binutils/gdb -I/usr/src/gnu/usr.bin/binutils/gdb/../libbfd/i386 -I/usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/binutils/include -Dprint_insn_i386=print_insn_i386_att -I/usr/src/gnu/usr.bin/binutils/gdb/i386 -I/usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/binutils/binuti ls -I/usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/binutils/bfd -I/usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb -I/usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb/config -DFREEBSD_ELF -I/usr/src/gnu/usr.bin/binutils/gdb -I/usr/obj/usr/src/world_i386/usr/include/readline -DNO_MMALLOC init.c /usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb/annotate.c /usr/src/gnu/usr.bin/binutils/gdb/../../../../contrib/gdb/gdb/ax-genera l.c [... etc etc etc ...] In file included from /usr/obj/usr/src/world_i386/usr/include/sys/globaldata.h:82, from /usr/src/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c:36: /usr/obj/usr/src/world_i386/usr/include/sys/systimer.h:43: #error "This file should not be included by userland programs." mkdep: compile failed *** Error code 1e Everything else works, so I'd like to commit everything else, and address these two issues in a second pass. -Chris