PERFORCE change 54591 for review
Julian Elischer
julian at FreeBSD.org
Thu Jun 10 23:16:56 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=54591
Change 54591 by julian at julian_ref on 2004/06/10 23:16:29
IFC and sir merge-alot
Affected files ...
.. //depot/projects/nsched/sys/alpha/alpha/mem.c#3 integrate
.. //depot/projects/nsched/sys/alpha/alpha/pmap.c#4 integrate
.. //depot/projects/nsched/sys/alpha/alpha/promcons.c#2 integrate
.. //depot/projects/nsched/sys/alpha/alpha/support.s#2 integrate
.. //depot/projects/nsched/sys/alpha/alpha/uio_machdep.c#3 integrate
.. //depot/projects/nsched/sys/alpha/include/pc/bios.h#2 integrate
.. //depot/projects/nsched/sys/alpha/linux/linux_proto.h#2 integrate
.. //depot/projects/nsched/sys/alpha/linux/linux_syscall.h#2 integrate
.. //depot/projects/nsched/sys/alpha/linux/linux_sysent.c#2 integrate
.. //depot/projects/nsched/sys/alpha/linux/syscalls.master#2 integrate
.. //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#2 integrate
.. //depot/projects/nsched/sys/amd64/acpica/madt.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/fpu.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/identcpu.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/nsched/sys/amd64/amd64/io_apic.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/legacy.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/mem.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/mpboot.S#2 integrate
.. //depot/projects/nsched/sys/amd64/amd64/mptable.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/nsched/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/nsched/sys/amd64/amd64/uio_machdep.c#3 integrate
.. //depot/projects/nsched/sys/amd64/conf/GENERIC#4 integrate
.. //depot/projects/nsched/sys/amd64/include/asm.h#3 integrate
.. //depot/projects/nsched/sys/amd64/include/cputypes.h#2 integrate
.. //depot/projects/nsched/sys/amd64/include/md_var.h#3 integrate
.. //depot/projects/nsched/sys/amd64/include/param.h#2 integrate
.. //depot/projects/nsched/sys/amd64/include/pmap.h#6 integrate
.. //depot/projects/nsched/sys/amd64/include/profile.h#4 integrate
.. //depot/projects/nsched/sys/amd64/include/specialreg.h#3 integrate
.. //depot/projects/nsched/sys/amd64/isa/atpic.c#3 integrate
.. //depot/projects/nsched/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/nsched/sys/amd64/pci/pci_bus.c#3 integrate
.. //depot/projects/nsched/sys/arm/arm/exception.S#2 integrate
.. //depot/projects/nsched/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/nsched/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/nsched/sys/arm/arm/uio_machdep.c#2 integrate
.. //depot/projects/nsched/sys/boot/i386/boot2/boot1.S#4 integrate
.. //depot/projects/nsched/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/nsched/sys/compat/ndis/kern_ndis.c#4 integrate
.. //depot/projects/nsched/sys/compat/ndis/subr_ndis.c#5 integrate
.. //depot/projects/nsched/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/nsched/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/nsched/sys/conf/NOTES#4 integrate
.. //depot/projects/nsched/sys/conf/files#10 integrate
.. //depot/projects/nsched/sys/conf/files.sparc64#3 integrate
.. //depot/projects/nsched/sys/conf/kmod.mk#4 integrate
.. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/if_pflog.c#3 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/nsched/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/nsched/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/nsched/sys/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/nsched/sys/dev/aac/aacvar.h#3 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#5 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_pci.c#5 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_pcib.c#3 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_powerres.c#4 integrate
.. //depot/projects/nsched/sys/dev/adlink/adlink.c#2 integrate
.. //depot/projects/nsched/sys/dev/arl/if_arl.c#4 integrate
.. //depot/projects/nsched/sys/dev/ata/ata-cbus.c#3 integrate
.. //depot/projects/nsched/sys/dev/ata/ata-lowlevel.c#4 integrate
.. //depot/projects/nsched/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/nsched/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/nsched/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/nsched/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/nsched/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/nsched/sys/dev/ciss/cissreg.h#5 integrate
.. //depot/projects/nsched/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/nsched/sys/dev/cy/cy.c#3 integrate
.. //depot/projects/nsched/sys/dev/dcons/dcons.c#3 integrate
.. //depot/projects/nsched/sys/dev/digi/digi.c#3 integrate
.. //depot/projects/nsched/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/nsched/sys/dev/eisa/eisa_if.m#1 branch
.. //depot/projects/nsched/sys/dev/eisa/eisaconf.c#2 integrate
.. //depot/projects/nsched/sys/dev/eisa/eisaconf.h#2 integrate
.. //depot/projects/nsched/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/nsched/sys/dev/esp/esp_sbus.c#1 branch
.. //depot/projects/nsched/sys/dev/esp/lsi64854.c#1 branch
.. //depot/projects/nsched/sys/dev/esp/lsi64854reg.h#1 branch
.. //depot/projects/nsched/sys/dev/esp/lsi64854var.h#1 branch
.. //depot/projects/nsched/sys/dev/esp/ncr53c9x.c#1 branch
.. //depot/projects/nsched/sys/dev/esp/ncr53c9xreg.h#1 branch
.. //depot/projects/nsched/sys/dev/esp/ncr53c9xvar.h#1 branch
.. //depot/projects/nsched/sys/dev/fb/tga.c#2 integrate
.. //depot/projects/nsched/sys/dev/fb/vga.c#3 integrate
.. //depot/projects/nsched/sys/dev/fe/if_fe.c#4 integrate
.. //depot/projects/nsched/sys/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/nsched/sys/dev/fxp/if_fxpvar.h#3 integrate
.. //depot/projects/nsched/sys/dev/gem/if_gem.c#4 integrate
.. //depot/projects/nsched/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/nsched/sys/dev/hme/if_hme.c#4 integrate
.. //depot/projects/nsched/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/nsched/sys/dev/hme/if_hme_sbus.c#3 integrate
.. //depot/projects/nsched/sys/dev/if_ndis/if_ndis.c#6 integrate
.. //depot/projects/nsched/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate
.. //depot/projects/nsched/sys/dev/if_ndis/if_ndis_pci.c#2 integrate
.. //depot/projects/nsched/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/nsched/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/nsched/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/nsched/sys/dev/kbd/atkbd.c#2 integrate
.. //depot/projects/nsched/sys/dev/lge/if_lge.c#3 integrate
.. //depot/projects/nsched/sys/dev/lnc/if_lnc.c#4 integrate
.. //depot/projects/nsched/sys/dev/lnc/if_lnc_cbus.c#2 integrate
.. //depot/projects/nsched/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/nsched/sys/dev/nge/if_nge.c#4 integrate
.. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#4 integrate
.. //depot/projects/nsched/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/nsched/sys/dev/pcf/envctrl.c#2 integrate
.. //depot/projects/nsched/sys/dev/pcf/pcf_ebus.c#1 branch
.. //depot/projects/nsched/sys/dev/pcf/pcf_isa.c#2 integrate
.. //depot/projects/nsched/sys/dev/puc/puc_ebus.c#2 integrate
.. //depot/projects/nsched/sys/dev/puc/puc_sbus.c#3 integrate
.. //depot/projects/nsched/sys/dev/rc/rc.c#3 integrate
.. //depot/projects/nsched/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/nsched/sys/dev/rp/rp.c#2 integrate
.. //depot/projects/nsched/sys/dev/sab/sab.c#2 integrate
.. //depot/projects/nsched/sys/dev/si/si.c#2 integrate
.. //depot/projects/nsched/sys/dev/sio/sio.c#4 integrate
.. //depot/projects/nsched/sys/dev/sio/sio_pci.c#2 integrate
.. //depot/projects/nsched/sys/dev/sn/if_sn.c#4 integrate
.. //depot/projects/nsched/sys/dev/sound/isa/emu8000.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/isa/gusmidi.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/isa/mpu.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/isa/opl.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/isa/uartsio.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/midi.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/midi.h#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/midibuf.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/midibuf.h#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/midisynth.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/midisynth.h#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/miditypes.h#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/sequencer.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/sequencer.h#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/timer.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/midi/timer.h#2 delete
.. //depot/projects/nsched/sys/dev/sound/pci/csamidi.c#2 delete
.. //depot/projects/nsched/sys/dev/sound/pci/emu10k1.c#3 integrate
.. //depot/projects/nsched/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/nsched/sys/dev/sx/sx.c#2 integrate
.. //depot/projects/nsched/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/nsched/sys/dev/syscons/sysmouse.c#2 integrate
.. //depot/projects/nsched/sys/dev/tga/tga_pci.c#2 integrate
.. //depot/projects/nsched/sys/dev/tx/if_tx.c#3 integrate
.. //depot/projects/nsched/sys/dev/uart/uart_bus_ebus.c#3 integrate
.. //depot/projects/nsched/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/nsched/sys/dev/usb/if_aue.c#4 integrate
.. //depot/projects/nsched/sys/dev/usb/if_axe.c#4 integrate
.. //depot/projects/nsched/sys/dev/usb/if_cue.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/if_rue.c#4 integrate
.. //depot/projects/nsched/sys/dev/usb/if_udav.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/ubser.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/ucom.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/uftdi.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/uhub.c#2 integrate
.. //depot/projects/nsched/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/nsched/sys/dev/usb/usbdevs.h#4 integrate
.. //depot/projects/nsched/sys/dev/usb/usbdevs_data.h#4 integrate
.. //depot/projects/nsched/sys/dev/wi/if_wi_pccard.c#4 integrate
.. //depot/projects/nsched/sys/dev/xe/if_xe.c#4 integrate
.. //depot/projects/nsched/sys/dev/zs/zs.c#3 integrate
.. //depot/projects/nsched/sys/dev/zs/zs_sbus.c#2 integrate
.. //depot/projects/nsched/sys/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/nsched/sys/geom/geom_io.c#3 integrate
.. //depot/projects/nsched/sys/geom/geom_sunlabel_enc.c#2 integrate
.. //depot/projects/nsched/sys/geom/nop/g_nop.c#2 integrate
.. //depot/projects/nsched/sys/i386/acpica/acpi_machdep.c#3 integrate
.. //depot/projects/nsched/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/nsched/sys/i386/bios/mca_machdep.c#2 integrate
.. //depot/projects/nsched/sys/i386/bios/smapi.c#2 integrate
.. //depot/projects/nsched/sys/i386/bios/smbios.c#2 integrate
.. //depot/projects/nsched/sys/i386/bios/vpd.c#2 integrate
.. //depot/projects/nsched/sys/i386/i386/bios.c#3 integrate
.. //depot/projects/nsched/sys/i386/i386/geode.c#2 integrate
.. //depot/projects/nsched/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/nsched/sys/i386/i386/io_apic.c#4 integrate
.. //depot/projects/nsched/sys/i386/i386/legacy.c#4 integrate
.. //depot/projects/nsched/sys/i386/i386/machdep.c#7 integrate
.. //depot/projects/nsched/sys/i386/i386/nexus.c#3 integrate
.. //depot/projects/nsched/sys/i386/i386/swtch.s#3 integrate
.. //depot/projects/nsched/sys/i386/i386/symbols.raw#2 integrate
.. //depot/projects/nsched/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/nsched/sys/i386/i386/uio_machdep.c#4 integrate
.. //depot/projects/nsched/sys/i386/i386/vm_machdep.c#6 integrate
.. //depot/projects/nsched/sys/i386/include/cputypes.h#3 integrate
.. //depot/projects/nsched/sys/i386/include/md_var.h#3 integrate
.. //depot/projects/nsched/sys/i386/include/pc/bios.h#2 integrate
.. //depot/projects/nsched/sys/i386/isa/npx.c#4 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_hdr.h#3 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_sup.c#2 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_vtf.c#2 integrate
.. //depot/projects/nsched/sys/i386/isa/vesa.c#2 integrate
.. //depot/projects/nsched/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/nsched/sys/i386/pci/pci_bus.c#4 integrate
.. //depot/projects/nsched/sys/i386/pci/pci_pir.c#4 integrate
.. //depot/projects/nsched/sys/ia64/ia64/mem.c#3 integrate
.. //depot/projects/nsched/sys/ia64/ia64/ssc.c#2 integrate
.. //depot/projects/nsched/sys/ia64/ia64/uio_machdep.c#3 integrate
.. //depot/projects/nsched/sys/isa/syscons_isa.c#2 integrate
.. //depot/projects/nsched/sys/kern/imgact_aout.c#2 integrate
.. //depot/projects/nsched/sys/kern/imgact_elf.c#5 integrate
.. //depot/projects/nsched/sys/kern/kern_clock.c#4 integrate
.. //depot/projects/nsched/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/nsched/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/nsched/sys/kern/kern_event.c#3 integrate
.. //depot/projects/nsched/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/nsched/sys/kern/kern_exit.c#9 integrate
.. //depot/projects/nsched/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/nsched/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/nsched/sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/nsched/sys/kern/kern_mbuf.c#1 branch
.. //depot/projects/nsched/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/nsched/sys/kern/kern_shutdown.c#3 integrate
.. //depot/projects/nsched/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/nsched/sys/kern/kern_subr.c#3 integrate
.. //depot/projects/nsched/sys/kern/kern_synch.c#5 integrate
.. //depot/projects/nsched/sys/kern/kern_thread.c#19 integrate
.. //depot/projects/nsched/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/nsched/sys/kern/subr_blist.c#2 integrate
.. //depot/projects/nsched/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/nsched/sys/kern/subr_mbuf.c#3 delete
.. //depot/projects/nsched/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/nsched/sys/kern/tty.c#3 integrate
.. //depot/projects/nsched/sys/kern/tty_conf.c#3 integrate
.. //depot/projects/nsched/sys/kern/tty_pty.c#3 integrate
.. //depot/projects/nsched/sys/kern/uipc_accf.c#3 integrate
.. //depot/projects/nsched/sys/kern/uipc_mbuf.c#4 integrate
.. //depot/projects/nsched/sys/kern/uipc_mbuf2.c#4 integrate
.. //depot/projects/nsched/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/nsched/sys/kern/uipc_socket2.c#4 integrate
.. //depot/projects/nsched/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/nsched/sys/kern/uipc_usrreq.c#3 integrate
.. //depot/projects/nsched/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/nsched/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/nsched/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate
.. //depot/projects/nsched/sys/modules/em/Makefile#2 integrate
.. //depot/projects/nsched/sys/modules/esp/Makefile#1 branch
.. //depot/projects/nsched/sys/modules/ipfilter/Makefile#3 integrate
.. //depot/projects/nsched/sys/modules/ixgb/Makefile#2 integrate
.. //depot/projects/nsched/sys/modules/vx/Makefile#2 integrate
.. //depot/projects/nsched/sys/net/ethernet.h#2 integrate
.. //depot/projects/nsched/sys/net/if_ethersubr.c#5 integrate
.. //depot/projects/nsched/sys/net/if_sl.c#3 integrate
.. //depot/projects/nsched/sys/net/netisr.h#3 integrate
.. //depot/projects/nsched/sys/net/rtsock.c#4 integrate
.. //depot/projects/nsched/sys/netatm/atm_ioctl.h#2 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate
.. //depot/projects/nsched/sys/netgraph/ng_ksocket.c#3 integrate
.. //depot/projects/nsched/sys/netgraph/ng_message.h#2 integrate
.. //depot/projects/nsched/sys/netgraph/ng_tee.c#3 integrate
.. //depot/projects/nsched/sys/netinet/in.h#3 integrate
.. //depot/projects/nsched/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/nsched/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/nsched/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/nsched/sys/netinet/raw_ip.c#4 integrate
.. //depot/projects/nsched/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/nsched/sys/pc98/i386/machdep.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/clock.c#3 integrate
.. //depot/projects/nsched/sys/pc98/pc98/mse.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/olpt.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/pc98gdc.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/pmc.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/ppc.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/scgdcrndr.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/scterm-sck.c#2 integrate
.. //depot/projects/nsched/sys/pc98/pc98/sio.c#4 integrate
.. //depot/projects/nsched/sys/pci/if_dc.c#4 integrate
.. //depot/projects/nsched/sys/pci/if_de.c#3 integrate
.. //depot/projects/nsched/sys/pci/if_pcn.c#3 integrate
.. //depot/projects/nsched/sys/pci/if_rl.c#5 integrate
.. //depot/projects/nsched/sys/pci/if_sf.c#3 integrate
.. //depot/projects/nsched/sys/pci/if_sis.c#4 integrate
.. //depot/projects/nsched/sys/pci/if_sk.c#4 integrate
.. //depot/projects/nsched/sys/pci/if_ste.c#6 integrate
.. //depot/projects/nsched/sys/pci/if_vr.c#5 integrate
.. //depot/projects/nsched/sys/pci/if_wb.c#3 integrate
.. //depot/projects/nsched/sys/pci/if_xl.c#4 integrate
.. //depot/projects/nsched/sys/powerpc/powerpc/uio_machdep.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/central/central.c#2 integrate
.. //depot/projects/nsched/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/nsched/sys/sparc64/ebus/ebus.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/fhc/fhc_central.c#2 integrate
.. //depot/projects/nsched/sys/sparc64/fhc/fhc_nexus.c#2 integrate
.. //depot/projects/nsched/sys/sparc64/include/asmacros.h#2 integrate
.. //depot/projects/nsched/sys/sparc64/pci/apb.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_ebus.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_fhc.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/sparc64/eeprom_sbus.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/sparc64/mem.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/sparc64/nexus.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/sparc64/uio_machdep.c#4 integrate
.. //depot/projects/nsched/sys/sparc64/sparc64/vm_machdep.c#5 integrate
.. //depot/projects/nsched/sys/sys/blist.h#2 integrate
.. //depot/projects/nsched/sys/sys/bus.h#3 integrate
.. //depot/projects/nsched/sys/sys/conf.h#3 integrate
.. //depot/projects/nsched/sys/sys/linedisc.h#1 branch
.. //depot/projects/nsched/sys/sys/mbuf.h#5 integrate
.. //depot/projects/nsched/sys/sys/param.h#4 integrate
.. //depot/projects/nsched/sys/sys/proc.h#12 integrate
.. //depot/projects/nsched/sys/sys/socket.h#4 integrate
.. //depot/projects/nsched/sys/sys/socketvar.h#3 integrate
.. //depot/projects/nsched/sys/sys/sun_disklabel.h#3 integrate
.. //depot/projects/nsched/sys/sys/systm.h#3 integrate
.. //depot/projects/nsched/sys/sys/tty.h#3 integrate
.. //depot/projects/nsched/sys/sys/vmmeter.h#3 integrate
.. //depot/projects/nsched/sys/sys/vnode.h#3 integrate
.. //depot/projects/nsched/sys/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/nsched/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/nsched/sys/vm/uma.h#2 integrate
.. //depot/projects/nsched/sys/vm/uma_core.c#2 integrate
.. //depot/projects/nsched/sys/vm/uma_dbg.c#2 integrate
.. //depot/projects/nsched/sys/vm/uma_int.h#2 integrate
.. //depot/projects/nsched/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/nsched/sys/vm/vm_page.h#4 integrate
.. //depot/projects/nsched/sys/vm/vm_pageq.c#3 integrate
Differences ...
==== //depot/projects/nsched/sys/alpha/alpha/mem.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.48 2004/04/05 21:00:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.49 2004/06/03 05:58:27 phk Exp $");
/*
* Memory special file
@@ -48,9 +48,10 @@
#include <sys/fcntl.h>
#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/mutex.h>
#include <sys/malloc.h>
#include <sys/memrange.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/msgbuf.h>
#include <sys/systm.h>
==== //depot/projects/nsched/sys/alpha/alpha/pmap.c#4 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.147 2004/06/10 04:30:59 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -612,7 +612,6 @@
pmap_init(void)
{
int i;
- int initial_pvs;
/*
* Allocate memory for random pmap data structures. Includes the
@@ -630,12 +629,9 @@
/*
* init the pv free list
*/
- initial_pvs = vm_page_array_size;
- if (initial_pvs < MINPV)
- initial_pvs = MINPV;
pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL,
NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
- uma_prealloc(pvzone, initial_pvs);
+ uma_prealloc(pvzone, MINPV);
/*
* Now it is safe to enable pv_table recording.
==== //depot/projects/nsched/sys/alpha/alpha/promcons.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.36 2004/02/28 16:36:14 kensmith Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.38 2004/06/04 16:02:48 phk Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -61,13 +61,11 @@
static d_open_t promopen;
static d_close_t promclose;
-static d_ioctl_t promioctl;
static struct cdevsw prom_cdevsw = {
.d_version = D_VERSION,
.d_open = promopen,
.d_close = promclose,
- .d_ioctl = promioctl,
.d_name = "prom",
.d_flags = D_TTY | D_NEEDGIANT,
};
@@ -126,7 +124,7 @@
splx(s);
- error = (*linesw[tp->t_line].l_open)(dev, tp);
+ error = ttyld_open(tp, dev);
if (error == 0 && setuptimeout) {
polltime = hz / PROM_POLL_HZ;
@@ -150,37 +148,12 @@
return ENXIO;
untimeout(promtimeout, tp, promtimeouthandle);
- (*linesw[tp->t_line].l_close)(tp, flag);
+ ttyld_close(tp, flag);
ttyclose(tp);
return 0;
}
int
-promioctl(dev, cmd, data, flag, td)
- dev_t dev;
- u_long cmd;
- caddr_t data;
- int flag;
- struct thread *td;
-{
- int unit = minor(dev);
- struct tty *tp = prom_tp;
- int error;
-
- if (unit != 0)
- return ENXIO;
-
- error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
- if (error != ENOIOCTL)
- return error;
- error = ttioctl(tp, cmd, data, flag);
- if (error != ENOIOCTL)
- return error;
-
- return ENOTTY;
-}
-
-int
promparam(tp, t)
struct tty *tp;
struct termios *t;
@@ -238,7 +211,7 @@
while ((c = promcncheckc(NULL)) != -1) {
if (tp->t_state & TS_ISOPEN)
- (*linesw[tp->t_line].l_rint)(c, tp);
+ ttyld_rint(tp, c);
}
promtimeouthandle = timeout(promtimeout, tp, polltime);
}
==== //depot/projects/nsched/sys/alpha/alpha/support.s#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/alpha/alpha/support.s,v 1.16 2004/01/19 21:27:10 phk Exp $
+ * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.17 2004/06/06 21:26:47 phk Exp $
*/
/*
@@ -680,10 +680,8 @@
longjmp_botch:
lda a0, longjmp_botchmsg
- mov 0, a1
- mov 0, a2
- mov ra, a3
- CALL(__panic)
+ mov ra, a1
+ CALL(panic)
call_pal PAL_bugchk
.data
==== //depot/projects/nsched/sys/alpha/alpha/uio_machdep.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.2 2004/04/05 21:00:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/uio_machdep.c,v 1.4 2004/06/03 10:22:45 tjr Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -70,12 +70,8 @@
("uiomove_fromphys: mode"));
KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread,
("uiomove_fromphys proc"));
- if (td != NULL) {
- mtx_lock_spin(&sched_lock);
- save = td->td_flags & TDF_DEADLKTREAT;
- td->td_flags |= TDF_DEADLKTREAT;
- mtx_unlock_spin(&sched_lock);
- }
+ save = td->td_pflags & TDP_DEADLKTREAT;
+ td->td_pflags |= TDP_DEADLKTREAT;
while (n > 0 && uio->uio_resid) {
iov = uio->uio_iov;
cnt = iov->iov_len;
@@ -119,10 +115,7 @@
n -= cnt;
}
out:
- if (td != NULL && save == 0) {
- mtx_lock_spin(&sched_lock);
- td->td_flags &= ~TDF_DEADLKTREAT;
- mtx_unlock_spin(&sched_lock);
- }
+ if (save == 0)
+ td->td_pflags &= ~TDP_DEADLKTREAT;
return (error);
}
==== //depot/projects/nsched/sys/alpha/include/pc/bios.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/alpha/include/pc/bios.h,v 1.5 1999/08/28 00:38:56 peter Exp $
+ * $FreeBSD: src/sys/alpha/include/pc/bios.h,v 1.6 2004/06/10 20:30:54 jhb Exp $
* from: i386/include/pc bios.h,v 1.2
*/
@@ -71,13 +71,8 @@
};
extern void bios32(caddr_t func_addr, struct bios32_args *args);
-#if 0
-#define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase)
-#define BIOS_VADDRTOPADDR(x) (((x) - atdevbase) + ISA_HOLE_START)
-#else
#define BIOS_PADDRTOVADDR(x) (x)
#define BIOS_VADDRTOPADDR(x) (x)
-#endif
/*
* System Management BIOS / Desktop Management Interface tables
==== //depot/projects/nsched/sys/alpha/linux/linux_proto.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.17 2004/03/29 02:19:43 bms Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.18 2004/06/04 13:52:51 jhb Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp
*/
#ifndef _LINUX_SYSPROTO_H_
==== //depot/projects/nsched/sys/alpha/linux/linux_syscall.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.15 2004/03/29 02:19:43 bms Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.16 2004/06/04 13:52:51 jhb Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/nsched/sys/alpha/linux/linux_sysent.c#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.15 2004/03/29 02:19:43 bms Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.16 2004/06/04 13:52:51 jhb Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp
*/
#include "opt_compat.h"
@@ -382,7 +382,7 @@
{ SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer }, /* 362 = linux_setitimer */
{ AS(linux_utimes_args), (sy_call_t *)linux_utimes }, /* 363 = linux_utimes */
{ SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage }, /* 364 = getrusage */
- { AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */
+ { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4 }, /* 365 = linux_wait4 */
{ 0, (sy_call_t *)linux_adjtimex }, /* 366 = linux_adjtimex */
{ AS(linux_getcwd_args), (sy_call_t *)linux_getcwd }, /* 367 = linux_getcwd */
{ 0, (sy_call_t *)linux_capget }, /* 368 = linux_capget */
==== //depot/projects/nsched/sys/alpha/linux/syscalls.master#2 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.57 2004/03/29 02:19:43 bms Exp $
+ $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -445,7 +445,7 @@
struct l_itimerval *oitv); }
363 STD { int linux_utimes(char *fname, struct l_timeval *times); }
364 MNOPROTO { int getrusage(int who, struct rusage *rusage); }
-365 STD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \
+365 MSTD { int linux_wait4(l_pid_t pid, l_uint *status, l_int options, \
struct l_rusage *rusage); }
366 STD { int linux_adjtimex(void); }
367 STD { int linux_getcwd(char *buf, l_ulong bufsize); }
==== //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.42 2004/02/21 21:10:38 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.44 2004/06/04 16:02:48 phk Exp $");
#include "opt_ddb.h"
@@ -68,13 +68,11 @@
static d_open_t zsopen;
static d_close_t zsclose;
-static d_ioctl_t zsioctl;
static struct cdevsw zs_cdevsw = {
.d_version = D_VERSION,
.d_open = zsopen,
.d_close = zsclose,
- .d_ioctl = zsioctl,
.d_name = "zs",
.d_flags = D_TTY | D_NEEDGIANT,
};
@@ -293,7 +291,7 @@
splx(s);
- error = (*linesw[tp->t_line].l_open)(dev, tp);
+ error = ttyld_open(tp, dev);
if (error == 0 && setuptimeout) {
zspolltime = hz / 50;
@@ -320,7 +318,7 @@
s = spltty();
untimeout(zs_poll_intr, sc, sc->zst);
- (*linesw[tp->t_line].l_close)(tp, flag);
+ ttyld_close(tp, flag);
ttyclose(tp);
splx(s);
@@ -328,31 +326,6 @@
}
static int
-zsioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
-{
- struct zs_softc *sc = ZS_SOFTC(minor(dev));
- struct tty *tp;
- int error;
-
- if (sc == NULL)
- return (ENXIO);
-
- tp = ZS_SOFTC(minor(dev))->tp;
-
- error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, td);
-
- if (error != ENOIOCTL)
- return (error);
-
- error = ttioctl(tp, cmd, data, flag);
-
- if (error != ENOIOCTL)
- return (error);
- else
- return (ENOTTY);
-}
-
-static int
zsparam(struct tty *tp, struct termios *t)
{
return (0);
@@ -529,7 +502,7 @@
Debugger("manual escape to debugger");
#endif
if (tp && (tp->t_state & TS_ISOPEN))
- (*linesw[tp->t_line].l_rint)(c, tp);
+ ttyld_rint(tp, c);
DELAY(5);
}
}
@@ -544,7 +517,7 @@
Debugger("manual escape to debugger");
#endif
if (tp && (tp->t_state & TS_ISOPEN))
- (*linesw[tp->t_line].l_rint)(c, tp);
+ ttyld_rint(tp, c);
DELAY(5);
}
}
==== //depot/projects/nsched/sys/amd64/acpica/madt.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.14 2004/06/10 21:30:08 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,10 +65,9 @@
} ioapics[NIOAPICS];
struct lapic_info {
- u_int la_present:1;
u_int la_enabled:1;
- u_int la_apic_id:8;
-} lapics[NLAPICS + 1];
+ u_int la_acpi_id:8;
+} lapics[NLAPICS];
static int madt_found_sci_override;
static MULTIPLE_APIC_TABLE *madt;
@@ -447,18 +446,17 @@
printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n",
proc->LocalApicId, proc->ProcessorId,
proc->ProcessorEnabled ? "enabled" : "disabled");
- if (proc->ProcessorId > NLAPICS)
+ if (!proc->ProcessorEnabled)
+ break;
+ if (proc->LocalApicId >= NLAPICS)
panic("%s: CPU ID %d too high", __func__,
- proc->ProcessorId);
- la = &lapics[proc->ProcessorId];
- KASSERT(la->la_present == 0,
- ("Duplicate local ACPI ID %d", proc->ProcessorId));
- la->la_present = 1;
- la->la_apic_id = proc->LocalApicId;
- if (proc->ProcessorEnabled) {
- la->la_enabled = 1;
- lapic_create(proc->LocalApicId, 0);
- }
+ proc->LocalApicId);
+ la = &lapics[proc->LocalApicId];
+ KASSERT(la->la_enabled == 0,
+ ("Duplicate local APIC ID %d", proc->LocalApicId));
+ la->la_enabled = 1;
+ la->la_acpi_id = proc->ProcessorId;
+ lapic_create(proc->LocalApicId, 0);
break;
}
}
@@ -545,14 +543,17 @@
static int
madt_find_cpu(u_int acpi_id, u_int *apic_id)
{
+ int i;
- if (!lapics[acpi_id].la_present)
- return (ENOENT);
- *apic_id = lapics[acpi_id].la_apic_id;
- if (lapics[acpi_id].la_enabled)
+ for (i = 0; i < NLAPICS; i++) {
+ if (!lapics[i].la_enabled)
+ continue;
+ if (lapics[i].la_acpi_id != acpi_id)
+ continue;
+ *apic_id = i;
return (0);
- else
- return (ENXIO);
+ }
+ return (ENOENT);
}
/*
@@ -752,8 +753,9 @@
static void
madt_set_ids(void *dummy)
{
+ struct lapic_info *la;
struct pcpu *pc;
- u_int i, j;
+ u_int i;
if (madt == NULL)
return;
@@ -762,19 +764,14 @@
continue;
pc = pcpu_find(i);
KASSERT(pc != NULL, ("no pcpu data for CPU %d", i));
- for (j = 0; j < NLAPICS + 1; j++) {
- if (!lapics[j].la_present || !lapics[j].la_enabled)
- continue;
- if (lapics[j].la_apic_id == pc->pc_apic_id) {
- pc->pc_acpi_id = j;
- if (bootverbose)
- printf("APIC: CPU %u has ACPI ID %u\n",
- i, j);
- break;
- }
- }
- if (j == NLAPICS + 1)
- panic("Unable to find ACPI ID for CPU %d", i);
+ la = &lapics[pc->pc_apic_id];
+ if (!la->la_enabled)
+ panic("APIC: CPU with APIC ID %u is not enabled",
+ pc->pc_apic_id);
+ pc->pc_acpi_id = la->la_acpi_id;
+ if (bootverbose)
+ printf("APIC: CPU %u has ACPI ID %u\n", i,
+ la->la_acpi_id);
}
}
SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL)
==== //depot/projects/nsched/sys/amd64/amd64/fpu.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.149 2004/04/05 21:25:51 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.153 2004/06/08 01:35:48 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,6 +73,7 @@
#define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr)))
#define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr)))
#define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr)))
+#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : : "m" (r))
#define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \
: : "n" (CR0_TS) : "ax")
#define stop_emulating() __asm("clts")
@@ -111,6 +112,7 @@
fpuinit(void)
{
register_t savecrit;
+ u_int mxcsr;
u_short control;
savecrit = intr_disable();
@@ -119,6 +121,8 @@
fninit();
control = __INITIAL_FPUCW__;
fldcw(&control);
+ mxcsr = __INITIAL_MXCSR__;
+ ldmxcsr(mxcsr);
fxsave(&fpu_cleanstate);
start_emulating();
fpu_cleanstate_ready = 1;
==== //depot/projects/nsched/sys/amd64/amd64/identcpu.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.131 2004/04/07 00:44:15 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.134 2004/06/08 01:20:37 peter Exp $");
#include "opt_cpu.h"
@@ -69,13 +69,10 @@
void earlysetcpuclass(void);
void panicifcpuunsupported(void);
-static void print_AMD_features(void);
static void print_AMD_info(void);
static void print_AMD_assoc(int i);
-int cpu_feature2; /* XXX change cpu_feature to long? */
int cpu_class;
-u_int cpu_exthigh; /* Highest arg to extended CPUID */
char machine[] = "amd64";
SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD,
machine, 0, "Machine class");
@@ -90,7 +87,10 @@
static char cpu_brand[48];
-static struct cpu_nameclass amd64_cpus[] = {
+static struct {
+ char *cpu_name;
+ int cpu_class;
+} amd64_cpus[] = {
{ "Clawhammer", CPUCLASS_K8 }, /* CPU_CLAWHAMMER */
{ "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */
};
@@ -106,26 +106,18 @@
strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model));
/* Check for extended CPUID information and a processor name. */
- if (cpu_high > 0 &&
- (strcmp(cpu_vendor, "GenuineIntel") == 0 ||
- strcmp(cpu_vendor, "AuthenticAMD") == 0)) {
- do_cpuid(0x80000000, regs);
- if (regs[0] >= 0x80000000) {
- cpu_exthigh = regs[0];
- if (cpu_exthigh >= 0x80000004) {
- brand = cpu_brand;
- for (i = 0x80000002; i < 0x80000005; i++) {
- do_cpuid(i, regs);
- memcpy(brand, regs, sizeof(regs));
- brand += sizeof(regs);
- }
- }
+ if (cpu_exthigh >= 0x80000004) {
+ brand = cpu_brand;
+ for (i = 0x80000002; i < 0x80000005; i++) {
+ do_cpuid(i, regs);
+ memcpy(brand, regs, sizeof(regs));
+ brand += sizeof(regs);
}
}
if (strcmp(cpu_vendor, "GenuineIntel") == 0) {
- /* Better late than never I suppose.. */
- strcat(cpu_model, "IA-32e");
+ /* Please make up your mind folks! */
+ strcat(cpu_model, "EM64T");
} else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
/*
* Values taken from AMD Processor Recognition
@@ -256,6 +248,43 @@
"\040<b31>"
);
}
+ if (amd_feature != 0) {
+ printf("\n AMD Features=0x%b", amd_feature,
+ "\020" /* in hex */
+ "\001<s0>" /* Same */
+ "\002<s1>" /* Same */
+ "\003<s2>" /* Same */
+ "\004<s3>" /* Same */
+ "\005<s4>" /* Same */
+ "\006<s5>" /* Same */
+ "\007<s6>" /* Same */
+ "\010<s7>" /* Same */
+ "\011<s8>" /* Same */
+ "\012<s9>" /* Same */
+ "\013<b10>" /* Undefined */
+ "\014SYSCALL" /* Have SYSCALL/SYSRET */
+ "\015<s12>" /* Same */
+ "\016<s13>" /* Same */
+ "\017<s14>" /* Same */
+ "\020<s15>" /* Same */
+ "\021<s16>" /* Same */
+ "\022<s17>" /* Same */
+ "\023<b18>" /* Reserved, unknown */
+ "\024MP" /* Multiprocessor Capable */
+ "\025NX" /* Has EFER.NXE, NX */
+ "\026<b21>" /* Undefined */
+ "\027MMX+" /* AMD MMX Extensions */
+ "\030<s23>" /* Same */
+ "\031<s24>" /* Same */
+ "\032<b25>" /* Undefined */
+ "\033<b26>" /* Undefined */
+ "\034<b27>" /* Undefined */
+ "\035<b28>" /* Undefined */
+ "\036LM" /* 64 bit long mode */
+ "\0373DNow+" /* AMD 3DNow! Extensions */
+ "\0403DNow" /* AMD 3DNow! */
+ );
+ }
/*
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list