PERFORCE change 41372 for review
John Baldwin
jhb at FreeBSD.org
Tue Nov 4 11:50:18 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=41372
Change 41372 by jhb at jhb_laptop on 2003/11/04 11:50:05
IFC @41369.
Affected files ...
.. //depot/projects/smpng/sys/alpha/osf1/osf1_ioctl.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#14 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#11 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#9 integrate
.. //depot/projects/smpng/sys/boot/common/dev_net.c#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#30 integrate
.. //depot/projects/smpng/sys/conf/files#89 integrate
.. //depot/projects/smpng/sys/conf/files.i386#48 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#49 integrate
.. //depot/projects/smpng/sys/conf/kern.post.mk#25 integrate
.. //depot/projects/smpng/sys/conf/majors#29 integrate
.. //depot/projects/smpng/sys/conf/options#65 integrate
.. //depot/projects/smpng/sys/conf/options.i386#32 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#32 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/ah_devid.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/ah_osdep.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/ath/version.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#7 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#12 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/FREEBSD-upgrade#2 integrate
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/addr.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/genfiles#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/misc/straddr.c#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/geniec.awk#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/genieh.awk#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/genmsgc.awk#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/genmsgh.awk#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/ie.def#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/msg.def#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/parseie.awk#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/parsemsg.awk#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/priv.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/privmsg.c#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/traffic.c#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_config.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_hdr.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_ie.c#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_ie.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_ietab.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_msg.c#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uni_msg.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/unimsglib.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/uniprint.h#1 branch
.. //depot/projects/smpng/sys/contrib/ngatm/netnatm/msg/unistruct.h#1 branch
.. //depot/projects/smpng/sys/dev/aac/aac_pci.c#26 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#12 integrate
.. //depot/projects/smpng/sys/dev/an/if_an.c#33 integrate
.. //depot/projects/smpng/sys/dev/ar/if_ar.c#10 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#41 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#21 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#33 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#13 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#38 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#13 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#5 integrate
.. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#9 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#35 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#20 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#18 integrate
.. //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#5 integrate
.. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#8 integrate
.. //depot/projects/smpng/sys/dev/cm/smc90cx6var.h#3 integrate
.. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#14 integrate
.. //depot/projects/smpng/sys/dev/cs/if_cs.c#6 integrate
.. //depot/projects/smpng/sys/dev/cs/if_cs_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#7 integrate
.. //depot/projects/smpng/sys/dev/cs/if_csreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/cs/if_csvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_drv.h#12 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#12 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed.c#15 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#9 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#7 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#19 integrate
.. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/ed/if_edvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.c#27 integrate
.. //depot/projects/smpng/sys/dev/en/if_en_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#20 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep.c#13 integrate
.. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#13 integrate
.. //depot/projects/smpng/sys/dev/ep/if_epreg.h#5 integrate
.. //depot/projects/smpng/sys/dev/ex/if_ex.c#7 integrate
.. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#7 integrate
.. //depot/projects/smpng/sys/dev/fe/if_fe.c#7 integrate
.. //depot/projects/smpng/sys/dev/fe/if_fevar.h#2 integrate
.. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#14 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci.c#25 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#20 integrate
.. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#16 integrate
.. //depot/projects/smpng/sys/dev/firewire/sbp.c#27 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#46 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#12 integrate
.. //depot/projects/smpng/sys/dev/gem/if_gem.c#16 integrate
.. //depot/projects/smpng/sys/dev/gx/if_gx.c#12 integrate
.. //depot/projects/smpng/sys/dev/harp/if_harp.c#3 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#10 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#6 integrate
.. //depot/projects/smpng/sys/dev/hatm/if_hatmvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#13 integrate
.. //depot/projects/smpng/sys/dev/ie/if_ie.c#8 integrate
.. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#9 integrate
.. //depot/projects/smpng/sys/dev/led/led.c#1 branch
.. //depot/projects/smpng/sys/dev/led/led.h#1 branch
.. //depot/projects/smpng/sys/dev/lge/if_lge.c#16 integrate
.. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#9 integrate
.. //depot/projects/smpng/sys/dev/mii/brgphy.c#19 integrate
.. //depot/projects/smpng/sys/dev/my/if_my.c#12 integrate
.. //depot/projects/smpng/sys/dev/nge/if_nge.c#26 integrate
.. //depot/projects/smpng/sys/dev/null/null.c#14 integrate
.. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#3 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccard.c#26 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs#33 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#33 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#17 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#34 integrate
.. //depot/projects/smpng/sys/dev/pdq/if_fea.c#7 integrate
.. //depot/projects/smpng/sys/dev/pdq/if_fpa.c#7 integrate
.. //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#6 integrate
.. //depot/projects/smpng/sys/dev/pdq/pdqvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#8 integrate
.. //depot/projects/smpng/sys/dev/puc/puc_pci.c#4 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev.c#15 integrate
.. //depot/projects/smpng/sys/dev/ray/if_ray.c#10 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#12 integrate
.. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#8 integrate
.. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#5 integrate
.. //depot/projects/smpng/sys/dev/sio/sio_pci.c#11 integrate
.. //depot/projects/smpng/sys/dev/sn/if_sn.c#10 integrate
.. //depot/projects/smpng/sys/dev/snc/dp83932.c#7 integrate
.. //depot/projects/smpng/sys/dev/sound/isa/mpu.c#11 integrate
.. //depot/projects/smpng/sys/dev/sr/if_sr.c#11 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#32 integrate
.. //depot/projects/smpng/sys/dev/tx/if_tx.c#13 integrate
.. //depot/projects/smpng/sys/dev/txp/if_txp.c#17 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/if_aue.c#26 integrate
.. //depot/projects/smpng/sys/dev/usb/if_axe.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/if_cue.c#19 integrate
.. //depot/projects/smpng/sys/dev/usb/if_kue.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/if_rue.c#5 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx.c#13 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#6 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/vx/if_vxvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#57 integrate
.. //depot/projects/smpng/sys/dev/wl/if_wl.c#15 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe.c#11 integrate
.. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#10 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#23 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#17 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/alpha-bitops.h#2 delete
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#26 integrate
.. //depot/projects/smpng/sys/i386/acpica/Makefile#5 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#12 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakecode.S#6 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#22 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#1 branch
.. //depot/projects/smpng/sys/i386/conf/GENERIC#43 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#67 integrate
.. //depot/projects/smpng/sys/i386/conf/PAE#7 integrate
.. //depot/projects/smpng/sys/i386/conf/SMP#3 delete
.. //depot/projects/smpng/sys/i386/i386/apic_vector.s#1 branch
.. //depot/projects/smpng/sys/i386/i386/autoconf.c#16 integrate
.. //depot/projects/smpng/sys/i386/i386/bios.c#19 integrate
.. //depot/projects/smpng/sys/i386/i386/critical.c#9 integrate
.. //depot/projects/smpng/sys/i386/i386/db_interface.c#20 integrate
.. //depot/projects/smpng/sys/i386/i386/db_trace.c#13 integrate
.. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#11 integrate
.. //depot/projects/smpng/sys/i386/i386/exception.s#16 integrate
.. //depot/projects/smpng/sys/i386/i386/genassym.c#26 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#26 integrate
.. //depot/projects/smpng/sys/i386/i386/initcpu.c#20 integrate
.. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/io_apic.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/locore.s#20 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#66 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#55 integrate
.. //depot/projects/smpng/sys/i386/i386/mpapic.c#16 delete
.. //depot/projects/smpng/sys/i386/i386/mpboot.s#4 integrate
.. //depot/projects/smpng/sys/i386/i386/mptable.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/mptable_pci.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/nexus.c#9 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#51 integrate
.. //depot/projects/smpng/sys/i386/i386/support.s#13 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#64 integrate
.. //depot/projects/smpng/sys/i386/include/apic.h#12 delete
.. //depot/projects/smpng/sys/i386/include/apicreg.h#1 branch
.. //depot/projects/smpng/sys/i386/include/apicvar.h#1 branch
.. //depot/projects/smpng/sys/i386/include/asmacros.h#4 integrate
.. //depot/projects/smpng/sys/i386/include/clock.h#7 integrate
.. //depot/projects/smpng/sys/i386/include/critical.h#5 integrate
.. //depot/projects/smpng/sys/i386/include/intr_machdep.h#1 branch
.. //depot/projects/smpng/sys/i386/include/md_var.h#23 integrate
.. //depot/projects/smpng/sys/i386/include/mptable.h#1 branch
.. //depot/projects/smpng/sys/i386/include/pcpu.h#8 integrate
.. //depot/projects/smpng/sys/i386/include/proc.h#11 integrate
.. //depot/projects/smpng/sys/i386/include/segments.h#8 integrate
.. //depot/projects/smpng/sys/i386/include/smp.h#11 integrate
.. //depot/projects/smpng/sys/i386/include/smptests.h#5 integrate
.. //depot/projects/smpng/sys/i386/isa/apic_ipl.s#7 delete
.. //depot/projects/smpng/sys/i386/isa/apic_vector.s#19 delete
.. //depot/projects/smpng/sys/i386/isa/atpic.c#1 branch
.. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#1 branch
.. //depot/projects/smpng/sys/i386/isa/bs/bsif.h#5 integrate
.. //depot/projects/smpng/sys/i386/isa/clock.c#30 integrate
.. //depot/projects/smpng/sys/i386/isa/cx.c#10 integrate
.. //depot/projects/smpng/sys/i386/isa/icu.h#6 integrate
.. //depot/projects/smpng/sys/i386/isa/icu_ipl.s#3 delete
.. //depot/projects/smpng/sys/i386/isa/icu_vector.s#12 delete
.. //depot/projects/smpng/sys/i386/isa/if_cx.c#6 integrate
.. //depot/projects/smpng/sys/i386/isa/if_el.c#8 integrate
.. //depot/projects/smpng/sys/i386/isa/if_le.c#12 integrate
.. //depot/projects/smpng/sys/i386/isa/if_rdp.c#10 integrate
.. //depot/projects/smpng/sys/i386/isa/intr_machdep.c#21 delete
.. //depot/projects/smpng/sys/i386/isa/intr_machdep.h#13 delete
.. //depot/projects/smpng/sys/i386/isa/isa_compat.c#5 integrate
.. //depot/projects/smpng/sys/i386/isa/ithread.c#6 delete
.. //depot/projects/smpng/sys/i386/isa/nmi.c#1 branch
.. //depot/projects/smpng/sys/i386/isa/npx.c#37 integrate
.. //depot/projects/smpng/sys/i386/isa/vector.s#4 delete
.. //depot/projects/smpng/sys/i386/pci/pci_bus.c#19 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#22 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#16 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#9 integrate
.. //depot/projects/smpng/sys/ia64/ia64/unaligned.c#6 integrate
.. //depot/projects/smpng/sys/ia64/include/_types.h#5 integrate
.. //depot/projects/smpng/sys/ia64/include/pc/bios.h#2 delete
.. //depot/projects/smpng/sys/ia64/include/pc/msdos.h#2 delete
.. //depot/projects/smpng/sys/ia64/include/pc/vesa.h#3 delete
.. //depot/projects/smpng/sys/isa/syscons_isa.c#7 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#21 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#78 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#14 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#19 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#28 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#21 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#106 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#35 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#52 integrate
.. //depot/projects/smpng/sys/kern/vfs_default.c#23 integrate
.. //depot/projects/smpng/sys/modules/Makefile#64 integrate
.. //depot/projects/smpng/sys/modules/cs/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/netgraph/atm/atmbase/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ppbus/Makefile#3 integrate
.. //depot/projects/smpng/sys/net/bpf.c#28 integrate
.. //depot/projects/smpng/sys/net/bridge.c#21 integrate
.. //depot/projects/smpng/sys/net/if.c#38 integrate
.. //depot/projects/smpng/sys/net/if.h#15 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#10 integrate
.. //depot/projects/smpng/sys/net/if_atmsubr.c#14 integrate
.. //depot/projects/smpng/sys/net/if_disc.c#9 integrate
.. //depot/projects/smpng/sys/net/if_ef.c#12 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#39 integrate
.. //depot/projects/smpng/sys/net/if_faith.c#16 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#17 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#8 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#23 integrate
.. //depot/projects/smpng/sys/net/if_media.c#5 integrate
.. //depot/projects/smpng/sys/net/if_mib.c#4 integrate
.. //depot/projects/smpng/sys/net/if_ppp.c#21 integrate
.. //depot/projects/smpng/sys/net/if_sl.c#18 integrate
.. //depot/projects/smpng/sys/net/if_spppsubr.c#15 integrate
.. //depot/projects/smpng/sys/net/if_stf.c#21 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#21 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#26 integrate
.. //depot/projects/smpng/sys/net/if_var.h#18 integrate
.. //depot/projects/smpng/sys/net/if_vlan.c#21 integrate
.. //depot/projects/smpng/sys/net/net_osdep.c#5 integrate
.. //depot/projects/smpng/sys/net/net_osdep.h#9 integrate
.. //depot/projects/smpng/sys/net/ppp_tty.c#11 integrate
.. //depot/projects/smpng/sys/net/route.c#13 integrate
.. //depot/projects/smpng/sys/net/route.h#13 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#27 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#8 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#4 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_output.c#5 integrate
.. //depot/projects/smpng/sys/netatm/atm_if.c#12 integrate
.. //depot/projects/smpng/sys/netatm/atm_if.h#9 integrate
.. //depot/projects/smpng/sys/netatm/atm_socket.c#10 integrate
.. //depot/projects/smpng/sys/netatm/atm_usrreq.c#11 integrate
.. //depot/projects/smpng/sys/netatm/atm_var.h#12 integrate
.. //depot/projects/smpng/sys/netatm/ipatm/ipatm_usrreq.c#6 integrate
.. //depot/projects/smpng/sys/netatm/spans/spans_arp.c#8 integrate
.. //depot/projects/smpng/sys/netatm/uni/uniarp.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_atm.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_bridge.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/ng_fec.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_gif.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#9 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#19 integrate
.. //depot/projects/smpng/sys/netinet/in.c#17 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#35 integrate
.. //depot/projects/smpng/sys/netinet/in_rmx.c#7 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#25 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#22 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#16 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#20 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#41 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#27 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#44 integrate
.. //depot/projects/smpng/sys/netinet/tcp_output.c#15 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#36 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#22 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#16 integrate
.. //depot/projects/smpng/sys/netinet6/esp_input.c#15 integrate
.. //depot/projects/smpng/sys/netinet6/icmp6.c#19 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#14 integrate
.. //depot/projects/smpng/sys/netinet6/in6.h#12 integrate
.. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#8 integrate
.. //depot/projects/smpng/sys/netinet6/in6_ifattach.h#2 integrate
.. //depot/projects/smpng/sys/netinet6/in6_pcb.c#24 integrate
.. //depot/projects/smpng/sys/netinet6/in6_rmx.c#5 integrate
.. //depot/projects/smpng/sys/netinet6/in6_src.c#12 integrate
.. //depot/projects/smpng/sys/netinet6/in6_var.h#8 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_forward.c#8 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_fw.c#13 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_fw.h#4 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_input.c#26 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#14 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#20 integrate
.. //depot/projects/smpng/sys/netinet6/ipsec.c#11 integrate
.. //depot/projects/smpng/sys/netinet6/ipsec.h#6 integrate
.. //depot/projects/smpng/sys/netinet6/ipsec6.h#3 integrate
.. //depot/projects/smpng/sys/netinet6/mld6.c#7 integrate
.. //depot/projects/smpng/sys/netinet6/mld6_var.h#3 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.c#15 integrate
.. //depot/projects/smpng/sys/netinet6/nd6.h#8 integrate
.. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#9 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#19 integrate
.. //depot/projects/smpng/sys/netinet6/udp6_output.c#13 integrate
.. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#23 integrate
.. //depot/projects/smpng/sys/netipx/ipx_ip.c#9 integrate
.. //depot/projects/smpng/sys/netkey/key.c#19 integrate
.. //depot/projects/smpng/sys/netkey/key.h#4 integrate
.. //depot/projects/smpng/sys/netkey/key_debug.c#8 integrate
.. //depot/projects/smpng/sys/netkey/keydb.c#4 integrate
.. //depot/projects/smpng/sys/netkey/keydb.h#4 integrate
.. //depot/projects/smpng/sys/netkey/keysock.c#17 integrate
.. //depot/projects/smpng/sys/netkey/keysock.h#3 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#14 integrate
.. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#21 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#5 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#27 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#37 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#13 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#60 integrate
.. //depot/projects/smpng/sys/pc98/pc98/clock.c#22 integrate
.. //depot/projects/smpng/sys/pc98/pc98/nmi.c#1 branch
.. //depot/projects/smpng/sys/pc98/pc98/syscons_pc98.c#7 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#47 integrate
.. //depot/projects/smpng/sys/pci/if_de.c#13 integrate
.. //depot/projects/smpng/sys/pci/if_devar.h#6 integrate
.. //depot/projects/smpng/sys/pci/if_pcn.c#20 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#38 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#22 integrate
.. //depot/projects/smpng/sys/pci/if_sis.c#33 integrate
.. //depot/projects/smpng/sys/pci/if_sk.c#22 integrate
.. //depot/projects/smpng/sys/pci/if_ste.c#24 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#32 integrate
.. //depot/projects/smpng/sys/pci/if_tl.c#17 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#20 integrate
.. //depot/projects/smpng/sys/pci/if_wb.c#19 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#36 integrate
.. //depot/projects/smpng/sys/pci/xrpu.c#11 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#19 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#13 integrate
.. //depot/projects/smpng/sys/sys/cdefs.h#22 integrate
.. //depot/projects/smpng/sys/sys/param.h#50 integrate
.. //depot/projects/smpng/sys/sys/proc.h#102 integrate
.. //depot/projects/smpng/sys/sys/resource.h#8 integrate
.. //depot/projects/smpng/sys/sys/sched.h#5 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#24 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#46 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#22 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#36 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#45 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#23 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#46 integrate
.. //depot/projects/smpng/sys/vm/vm_object.h#22 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#43 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/osf1/osf1_ioctl.c#8 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.10 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.12 2003/10/31 18:31:55 brooks Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -207,7 +207,7 @@
* because osf/1 doesn't know about most of them.
*/
if (ifp->if_type == IFT_ETHER
- && strcmp(ifp->if_name, "ti")) { /* looks good */
+ && strcmp(ifp->if_dname, "ti") != 0) { /* looks good */
/* walk the address list */
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) /* we have an address structure */
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#14 (text+ko) ====
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.443 2003/10/14 05:51:31 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.444 2003/10/30 04:08:22 peter Exp $");
/*
* Manages physical address maps.
@@ -2695,7 +2695,6 @@
vm_size_t size;
{
vm_offset_t base, offset, tmpva;
- pt_entry_t *pte;
/* If we gave a direct map region in pmap_mapdev, do nothing */
if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS)
@@ -2703,10 +2702,8 @@
base = va & PG_FRAME;
offset = va & PAGE_MASK;
size = roundup(offset + size, PAGE_SIZE);
- for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) {
- pte = vtopte(tmpva);
- pte_clear(pte);
- }
+ for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE)
+ pmap_kremove(tmpva);
pmap_invalidate_range(kernel_pmap, va, tmpva);
kmem_free(kernel_map, base, size);
}
==== //depot/projects/smpng/sys/amd64/amd64/trap.c#11 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.267 2003/10/28 01:06:37 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.268 2003/10/30 04:06:28 peter Exp $");
/*
* AMD64 Trap and System call handling
@@ -261,6 +261,8 @@
break;
case T_PAGEFLT: /* page fault */
+ if (td->td_flags & TDF_SA)
+ thread_user_enter(p, td);
i = trap_pfault(&frame, TRUE);
if (i == -1)
goto userout;
==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#9 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.217 2003/08/29 20:04:09 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.218 2003/10/30 19:04:58 peter Exp $");
#include "opt_isa.h"
#include "opt_kstack_pages.h"
@@ -205,7 +205,8 @@
cpu_thread_exit(struct thread *td)
{
- npxexit(td);
+ if (td == PCPU_GET(fpcurthread))
+ npxdrop();
}
void
@@ -265,6 +266,7 @@
* more analysis) (need a good safe default).
*/
bcopy(td0->td_pcb, pcb2, sizeof(*pcb2));
+ pcb2->pcb_flags &= ~(PCB_NPXTRAP|PCB_NPXINITDONE);
/*
* Create a new fresh stack for the new thread.
==== //depot/projects/smpng/sys/boot/common/dev_net.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.12 2003/08/25 23:30:41 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.13 2003/11/03 19:45:05 iedowse Exp $");
/*-
* This module implements a "raw device" interface suitable for
@@ -270,22 +270,22 @@
return (EIO);
}
exit:
- printf("net_open: server addr: %s\n", inet_ntoa(rootip));
-
/*
* If present, strip the server's address off of the rootpath
* before passing it along. This allows us to be compatible with
* the kernel's diskless (BOOTP_NFSROOT) booting conventions
*/
-
- for(i=0; i<FNAME_SIZE; i++)
- if(rootpath[i] == ':')
+ for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++)
+ if (rootpath[i] == ':')
break;
- if(i && i != FNAME_SIZE) {
- i++;
+ if (i && i != FNAME_SIZE && rootpath[i] == ':') {
+ rootpath[i++] = '\0';
+ if (inet_addr(&rootpath[0]) != INADDR_NONE)
+ rootip.s_addr = inet_addr(&rootpath[0]);
bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1);
bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1);
}
+ printf("net_open: server addr: %s\n", inet_ntoa(rootip));
printf("net_open: server path: %s\n", rootpath);
d = socktodesc(sock);
@@ -294,6 +294,8 @@
setenv("boot.netif.netmask", intoa(netmask), 1);
setenv("boot.netif.gateway", inet_ntoa(gateip), 1);
setenv("boot.netif.hwaddr", temp, 1);
+ setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
+ setenv("boot.nfsroot.path", rootpath, 1);
return (0);
}
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.2 2003/08/22 23:07:28 peter Exp $
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.3 2003/10/30 02:40:30 peter Exp $
*/
#ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
@@ -75,6 +75,8 @@
int32_t ru_nivcsw;
};
+#define FREEBSD32_MNAMELEN (88 - 2 * sizeof(int32_t)) /* size of on/from name bufs */
+
struct statfs32 {
int32_t f_spare2;
int32_t f_bsize;
@@ -91,12 +93,12 @@
int32_t f_syncwrites;
int32_t f_asyncwrites;
char f_fstypename[MFSNAMELEN];
- char f_mntonname[MNAMELEN];
+ char f_mntonname[FREEBSD32_MNAMELEN];
int32_t f_syncreads;
int32_t f_asyncreads;
int16_t f_spares1;
- char f_mntfromname[MNAMELEN];
- int16_t f_spares2;
+ char f_mntfromname[FREEBSD32_MNAMELEN];
+ int16_t f_spares2 __packed;
int32_t f_spare[2];
};
==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.13 2003/08/23 00:04:52 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.14 2003/10/30 02:40:30 peter Exp $");
#include "opt_compat.h"
@@ -79,6 +79,11 @@
#include <compat/freebsd32/freebsd32.h>
#include <compat/freebsd32/freebsd32_proto.h>
+CTASSERT(sizeof(struct timeval32) == 8);
+CTASSERT(sizeof(struct timespec32) == 8);
+CTASSERT(sizeof(struct statfs32) == 256);
+CTASSERT(sizeof(struct rusage32) == 72);
+
/*
* [ taken from the linux emulator ]
* Search an alternate path before passing pathname arguments on
@@ -356,6 +361,8 @@
int ss_flags;
};
+CTASSERT(sizeof(struct sigaltstack32) == 12);
+
int
freebsd32_sigaltstack(struct thread *td,
struct freebsd32_sigaltstack_args *uap)
@@ -589,6 +596,8 @@
struct timeval32 it_value;
};
+CTASSERT(sizeof(struct itimerval32) == 16);
+
int
freebsd32_setitimer(struct thread *td, struct freebsd32_setitimer_args *uap)
{
@@ -668,6 +677,8 @@
u_int32_t udata; /* opaque user data identifier */
};
+CTASSERT(sizeof(struct kevent32) == 20);
+
int
freebsd32_kevent(struct thread *td, struct freebsd32_kevent_args *uap)
{
@@ -819,6 +830,8 @@
};
#define STACKGAPLEN 400
+CTASSERT(sizeof(struct iovec32) == 8);
+
int
freebsd32_readv(struct thread *td, struct freebsd32_readv_args *uap)
{
@@ -1198,8 +1211,14 @@
u_int32_t st_blksize;
u_int32_t st_flags;
u_int32_t st_gen;
+ struct timespec32 st_birthtimespec;
+ unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
+ unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
};
+
+CTASSERT(sizeof(struct stat32) == 96);
+
static void
copy_stat( struct stat *in, struct stat32 *out)
{
@@ -1342,6 +1361,8 @@
sigset_t sa_mask;
};
+CTASSERT(sizeof(struct sigaction32) == 24);
+
int
freebsd32_sigaction(struct thread *td, struct freebsd32_sigaction_args *uap)
{
==== //depot/projects/smpng/sys/compat/ia32/ia32_signal.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.1 2003/05/14 04:10:48 peter Exp $
+ * $FreeBSD: src/sys/compat/ia32/ia32_signal.h,v 1.2 2003/10/30 02:40:30 peter Exp $
*/
struct ia32_sigaltstack {
@@ -35,7 +35,6 @@
int ss_flags; /* SS_DISABLE and/or SS_ONSTACK */
};
-/* XXX should be 640 bytes long; check and see if __packed is needed */
struct ia32_mcontext {
int mc_onstack; /* XXX - sigcontext compat. */
int mc_gs; /* machine state (struct trapframe) */
@@ -69,7 +68,6 @@
int mc_spare2[8];
};
-/* XXX should be 704 bytes long; check and see if __packed is needed */
struct ia32_ucontext {
sigset_t uc_sigmask;
struct ia32_mcontext uc_mcontext;
==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.9 2003/09/25 01:10:23 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.10 2003/10/30 02:43:19 peter Exp $");
#include "opt_compat.h"
@@ -75,6 +75,16 @@
#include <machine/pcb.h>
#include <machine/cpufunc.h>
+CTASSERT(sizeof(struct ia32_mcontext) == 640);
+CTASSERT(sizeof(struct ia32_ucontext) == 704);
+CTASSERT(sizeof(struct ia32_sigframe) == 800);
+CTASSERT(sizeof(struct ia32_siginfo) == 64);
+#ifdef COMPAT_FREEBSD4
+CTASSERT(sizeof(struct ia32_mcontext4) == 260);
+CTASSERT(sizeof(struct ia32_ucontext4) == 324);
+CTASSERT(sizeof(struct ia32_sigframe4) == 408);
+#endif
+
static register_t *ia32_copyout_strings(struct image_params *imgp);
static void ia32_setregs(struct thread *td, u_long entry, u_long stack,
u_long ps_strings);
==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#30 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.111 2003/10/20 17:56:10 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.112 2003/10/31 18:31:55 brooks Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1881,8 +1881,7 @@
/* Short-circuit non ethernet interfaces */
if (!IFP_IS_ETH(ifp))
- return (snprintf(buffer, buflen, "%s%d", ifp->if_name,
- ifp->if_unit));
+ return (strlcpy(buffer, ifp->if_xname, buflen));
/* Determine the (relative) unit number for ethernet interfaces */
ethno = 0;
@@ -1932,15 +1931,14 @@
* we never have an interface named "eth", so don't make
* the test optional based on is_eth.
*/
- if (ifp->if_unit == unit && ifp->if_name[len] == '\0' &&
- strncmp(ifp->if_name, lxname, len) == 0)
+ if (strncmp(ifp->if_xname, lxname, LINUX_IFNAMSIZ) == 0)
break;
if (is_eth && IFP_IS_ETH(ifp) && unit == index++)
break;
}
IFNET_RUNLOCK();
if (ifp != NULL)
- snprintf(bsdname, IFNAMSIZ, "%s%d", ifp->if_name, ifp->if_unit);
+ strlcpy(bsdname, ifp->if_xname, IFNAMSIZ);
return (ifp);
}
@@ -1988,8 +1986,7 @@
snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "eth%d",
ethno++);
else
- snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "%s%d",
- ifp->if_name, ifp->if_unit);
+ strlcpy(ifr.ifr_name, ifp->if_xname, LINUX_IFNAMSIZ);
/* Walk the address list */
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
==== //depot/projects/smpng/sys/conf/files#89 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.841 2003/10/27 11:19:08 harti Exp $
+# $FreeBSD: src/sys/conf/files,v 1.843 2003/11/03 12:05:58 harti Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -495,6 +495,7 @@
dev/joy/joy.c optional joy
dev/joy/joy_isa.c optional joy isa
dev/joy/joy_pccard.c optional joy pccard
+dev/led/led.c optional cpu_soekris
dev/lge/if_lge.c optional lge
dev/lmc/if_lmc.c optional lmc nowerror
dev/lnc/if_lnc.c optional lnc
@@ -1372,6 +1373,10 @@
netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
netgraph/atm/ngatmbase.c optional ngatm_atmbase
contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase
+contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase
+contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase
+contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase
+contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase
netgraph/atm/ng_atm.c optional ngatm_atm
netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu
contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu
==== //depot/projects/smpng/sys/conf/files.i386#48 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.454 2003/09/06 23:23:25 marcel Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.456 2003/11/03 22:46:43 jhb Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -167,12 +167,14 @@
no-obj no-implicit-rule before-depend \
clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin"
#
+i386/acpica/madt.c optional acpi apic
i386/bios/apm.c optional apm
i386/bios/mca_machdep.c optional mca
i386/bios/smapi.c optional smapi
i386/bios/smapi_bios.S optional smapi
i386/bios/smbios.c optional smbios
i386/bios/vpd.c optional vpd
+i386/i386/apic_vector.s optional apic
i386/i386/atomic.c standard \
compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
i386/i386/autoconf.c standard
@@ -185,6 +187,7 @@
i386/i386/db_trace.c optional ddb
i386/i386/dump_machdep.c standard
i386/i386/elan-mmcr.c optional cpu_elan
+i386/i386/elan-mmcr.c optional cpu_soekris
i386/i386/elf_machdep.c standard
i386/i386/exception.s standard
i386/i386/geode.c optional cpu_geode
@@ -193,15 +196,19 @@
i386/i386/identcpu.c standard
i386/i386/in_cksum.c optional inet
i386/i386/initcpu.c standard
+i386/i386/intr_machdep.c standard
+i386/i386/io_apic.c optional apic
i386/i386/k6_mem.c standard
i386/i386/legacy.c standard
+i386/i386/local_apic.c optional apic
i386/i386/locore.s standard no-obj
i386/i386/machdep.c standard
i386/i386/mem.c standard
i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
-i386/i386/mpapic.c optional smp
i386/i386/mpboot.s optional smp
+i386/i386/mptable.c optional apic
+i386/i386/mptable_pci.c optional apic pci
i386/i386/nexus.c standard
i386/i386/perfmon.c optional perfmon
i386/i386/perfmon.c optional perfmon profiling-routine
@@ -233,6 +240,8 @@
i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2
i386/ibcs2/imgact_coff.c optional ibcs2
i386/isa/asc.c count asc
+i386/isa/atpic.c standard
+i386/isa/atpic_vector.s standard
i386/isa/clock.c standard
i386/isa/cronyx.c optional cx
i386/isa/ctx.c optional ctx
@@ -246,8 +255,6 @@
i386/isa/if_el.c count el
i386/isa/if_le.c count le
i386/isa/if_rdp.c count rdp
-i386/isa/intr_machdep.c standard
-i386/isa/ithread.c standard
i386/isa/isa.c optional isa
i386/isa/isa_compat.c optional isa compat_oldisa \
warning "Old ISA driver compatibility shims present."
@@ -255,6 +262,7 @@
i386/isa/istallion.c optional stli nowerror
i386/isa/loran.c optional loran
i386/isa/mse.c optional mse
+i386/isa/nmi.c standard
i386/isa/npx.c optional npx
i386/isa/pcf.c optional pcf
i386/isa/pcvt/pcvt_drv.c optional vt
==== //depot/projects/smpng/sys/conf/files.pc98#49 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.279 2003/09/07 05:05:40 imp Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.280 2003/11/04 13:11:58 nyan Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -137,6 +137,7 @@
geom/geom_pc98.c standard
geom/geom_pc98_enc.c standard
i386/bios/apm.c optional apm
+i386/i386/apic_vector.s optional apic
i386/i386/atomic.c standard \
compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
i386/i386/autoconf.c standard
@@ -155,14 +156,18 @@
i386/i386/identcpu.c standard
i386/i386/in_cksum.c optional inet
i386/i386/initcpu.c standard
+i386/i386/intr_machdep.c standard
+i386/i386/io_apic.c optional apic
i386/i386/k6_mem.c standard
i386/i386/legacy.c standard
+i386/i386/local_apic.c optional apic
i386/i386/locore.s standard no-obj
i386/i386/mem.c standard
i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
-i386/i386/mpapic.c optional smp
i386/i386/mpboot.s optional smp
+i386/i386/mptable.c optional apic
+i386/i386/mptable_pci.c optional apic pci
i386/i386/nexus.c standard
i386/i386/perfmon.c optional perfmon
i386/i386/perfmon.c optional perfmon profiling-routine
@@ -193,6 +198,8 @@
i386/ibcs2/ibcs2_xenix.c optional ibcs2
i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2
i386/ibcs2/imgact_coff.c optional ibcs2
+i386/isa/atpic.c standard
+i386/isa/atpic_vector.s standard
i386/isa/bs/bs.c optional bs
i386/isa/bs/bsfunc.c optional bs
i386/isa/bs/bshw.c optional bs
@@ -208,8 +215,6 @@
i386/isa/if_el.c count el
i386/isa/if_le.c count le
i386/isa/if_rdp.c count rdp
-i386/isa/intr_machdep.c standard
-i386/isa/ithread.c standard
i386/isa/isa.c optional isa
i386/isa/isa_compat.c optional isa compat_oldisa \
warning "Old ISA driver compatibility shims present."
@@ -345,6 +350,7 @@
pc98/pc98/fd.c optional fdc
pc98/pc98/isa_dma.c optional isa
pc98/pc98/mse.c optional mse
+pc98/pc98/nmi.c standard
pc98/pc98/olpt.c optional olpt
pc98/pc98/pc98gdc.c optional gdc
pc98/pc98/pc98kbd.c optional pckbd
==== //depot/projects/smpng/sys/conf/kern.post.mk#25 (text+ko) ====
@@ -6,7 +6,7 @@
# should be defined in the kern.pre.mk so that port makefiles can
# override or augment them.
#
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.49 2003/08/07 19:12:06 ru Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.50 2003/11/04 06:38:37 green Exp $
#
# In case the config had a makeoptions DESTDIR...
@@ -57,7 +57,7 @@
gdbinit:
sed < ${S}/../tools/debugscripts/dot.gdbinit > .gdbinit \
- "s:MODPATH:modules${S}/modules:"
+ "s:MODPATH:${.OBJDIR}/modules:"
cp ${S}/../tools/debugscripts/gdbinit.kernel \
${S}/../tools/debugscripts/gdbinit.vinum ${.CURDIR}
cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \
==== //depot/projects/smpng/sys/conf/majors#29 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/majors,v 1.180 2003/10/06 09:13:08 phk Exp $
+# $FreeBSD: src/sys/conf/majors,v 1.181 2003/11/03 10:19:33 phk Exp $
#
# This list is semi-obsoleted by DEVFS, but for now it still contains
# the current allocation of device major numbers.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list