Date: Fri, 6 Jan 2006 20:21:56 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 89290 for review Message-ID: <200601062021.k06KLujL041410@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=89290 Change 89290 by jhb@jhb_slimer on 2006/01/06 20:21:45 IFC @89285. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#18 integrate .. //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#16 integrate .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#37 integrate .. //depot/projects/smpng/sys/alpha/include/_types.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/cpu.h#14 integrate .. //depot/projects/smpng/sys/alpha/include/cpuconf.h#5 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#31 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#40 integrate .. //depot/projects/smpng/sys/amd64/include/_types.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/cpu.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/frame.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#12 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#17 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#14 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#6 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#5 integrate .. //depot/projects/smpng/sys/arm/include/frame.h#4 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#25 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#61 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#27 integrate .. //depot/projects/smpng/sys/conf/NOTES#111 integrate .. //depot/projects/smpng/sys/conf/files#162 integrate .. //depot/projects/smpng/sys/conf/options#111 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#20 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#15 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.h#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.h#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.h#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.h#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#22 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#11 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#10 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#54 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#77 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#41 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#16 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#61 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#54 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#17 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#48 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#33 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#59 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#39 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#43 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#60 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#16 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#12 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#10 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#67 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#36 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#28 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#26 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#11 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#61 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#37 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#71 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#11 integrate .. //depot/projects/smpng/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/smpng/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/smpng/sys/dev/md/md.c#71 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#41 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#54 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#12 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#67 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#14 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#7 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#14 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#17 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/si/si.c#21 integrate .. //depot/projects/smpng/sys/dev/si/si3_t225.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#34 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#11 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/smpng/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_cdce.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ugraphire_rdesc.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#82 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#15 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#23 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#24 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#16 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#12 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#11 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#9 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#32 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#41 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#101 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#96 integrate .. //depot/projects/smpng/sys/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#27 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#45 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#90 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#9 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#10 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#18 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#12 integrate .. //depot/projects/smpng/sys/i386/include/cpu.h#14 integrate .. //depot/projects/smpng/sys/i386/include/frame.h#7 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#14 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#14 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#20 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#47 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#18 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#49 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#29 integrate .. //depot/projects/smpng/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#34 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#99 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#17 integrate .. //depot/projects/smpng/sys/ia64/include/_types.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#25 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#28 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#51 integrate .. //depot/projects/smpng/sys/kern/imgact_gzip.c#13 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#88 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#107 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#115 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#116 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#96 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#64 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#147 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#43 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#47 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#64 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#66 integrate .. //depot/projects/smpng/sys/kern/tty.c#63 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#66 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#116 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#95 integrate .. //depot/projects/smpng/sys/modules/Makefile#113 integrate .. //depot/projects/smpng/sys/modules/cardbus/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf_filter.c#9 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#20 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#7 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#68 integrate .. //depot/projects/smpng/sys/net/if_gif.c#31 integrate .. //depot/projects/smpng/sys/net/if_gif.h#12 integrate .. //depot/projects/smpng/sys/net/if_media.c#7 integrate .. //depot/projects/smpng/sys/net/if_mib.c#9 integrate .. //depot/projects/smpng/sys/net/if_mib.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#21 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#17 integrate .. //depot/projects/smpng/sys/netatm/atm_sys.h#6 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.h#7 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#17 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#23 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#56 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#50 integrate .. //depot/projects/smpng/sys/pc98/include/_types.h#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/smpng/sys/pci/if_de.c#32 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/smpng/sys/powerpc/include/clock.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/cpu.h#18 integrate .. //depot/projects/smpng/sys/powerpc/include/frame.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/profile.h#6 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#16 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#14 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/interrupt.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#66 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#14 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#38 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#62 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#20 integrate .. //depot/projects/smpng/sys/sparc64/include/cpu.h#15 integrate .. //depot/projects/smpng/sys/sparc64/include/frame.h#13 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#62 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#16 integrate .. //depot/projects/smpng/sys/sys/_lock.h#13 integrate .. //depot/projects/smpng/sys/sys/_timeval.h#2 integrate .. //depot/projects/smpng/sys/sys/copyright.h#8 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#10 integrate .. //depot/projects/smpng/sys/sys/ktrace.h#13 integrate .. //depot/projects/smpng/sys/sys/lock.h#35 integrate .. //depot/projects/smpng/sys/sys/malloc.h#24 integrate .. //depot/projects/smpng/sys/sys/param.h#94 integrate .. //depot/projects/smpng/sys/sys/syscall.h#63 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#63 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#65 integrate .. //depot/projects/smpng/sys/sys/systm.h#69 integrate .. //depot/projects/smpng/sys/sys/tty.h#20 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#53 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#50 integrate .. //depot/projects/smpng/sys/vm/memguard.c#3 integrate .. //depot/projects/smpng/sys/vm/memguard.h#3 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#61 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#33 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#53 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#74 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#69 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#31 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#55 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#27 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.41 2005/12/14 21:42:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $"); #include "opt_clock.h" @@ -157,7 +157,7 @@ static u_int32_t max_cycles_per_tick; static u_int32_t last_time; -static void handleclock(void* arg); +static void handleclock(int usermode, uintfptr_t pc); static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); @@ -230,8 +230,7 @@ */ /* - * Start the real-time and statistics clocks. Leave stathz 0 since there - * are no other timers available. + * Start the real-time and statistics clocks. */ void cpu_initclocks() @@ -275,7 +274,9 @@ */ if (hwrpb->rpb_type != ST_DEC_21000) { tc_init(&i8254_timecounter); - } + platform.clockintr = handleclock; + } else + platform.clockintr = hardclock; if (ncpus == 1) { alpha_timecounter.tc_frequency = freq; @@ -283,7 +284,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*)(void *)) handleclock; + profhz = hz; /* * Get the clock started. @@ -424,27 +425,23 @@ } static void -handleclock(void *arg) +handleclock(int usermode, uintfptr_t pc) { - /* - * XXX: TurboLaser doesn't have an i8254 counter. - * XXX: A replacement is needed, and another method - * XXX: of determining this would be nice. - */ - if (hwrpb->rpb_type != ST_DEC_21000) { - if (timecounter->tc_get_timecount == i8254_get_timecount) { - mtx_lock_spin(&clock_lock); - if (i8254_ticked) - i8254_ticked = 0; - else { - i8254_offset += timer0_max_count; - i8254_lastcount = 0; - } - clkintr_pending = 0; - mtx_unlock_spin(&clock_lock); + + KASSERT(hwrpb->rpb_type != ST_DEC_21000, + ("custom clock handler called on TurboLaser")); + if (timecounter->tc_get_timecount == i8254_get_timecount) { + mtx_lock_spin(&clock_lock); + if (i8254_ticked) + i8254_ticked = 0; + else { + i8254_offset += timer0_max_count; + i8254_lastcount = 0; } + clkintr_pending = 0; + mtx_unlock_spin(&clock_lock); } - hardclock(arg); + hardclock(usermode, pc); } void ==== //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.19 2005/12/31 14:39:18 netchild Exp $"); #include "opt_cpu.h" @@ -171,6 +171,13 @@ }; int napi_cpuinit = (sizeof(api_cpuinit) / sizeof(api_cpuinit[0])); +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} void platform_not_configured(int cputype) ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.20 2005/12/18 04:52:34 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.21 2005/12/26 21:23:56 sobomax Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -85,6 +85,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -99,6 +100,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#37 (text+ko) ==== @@ -33,7 +33,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.88 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.89 2005/12/22 22:16:04 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -489,23 +489,21 @@ */ if (PCPU_GET(cpuid) == 0) { #endif - (*platform.clockintr)(framep); - /* divide hz (1024) by 8 to get stathz (128) */ - if ((++schedclk2 & 0x7) == 0) { - if (profprocs != 0) - profclock((struct clockframe *)framep); - statclock((struct clockframe *)framep); - } + (*platform.clockintr)(TRAPF_USERMODE(framep), + TRAPF_PC(framep)); + + /* Bump stathz divider. */ + schedclk2++; #ifdef SMP - } else { - hardclock_process((struct clockframe *)framep); - if ((schedclk2 & 0x7) == 0) { - if (profprocs != 0) - profclock((struct clockframe *)framep); - statclock((struct clockframe *)framep); - } - } + } else + hardclock_cpu(TRAPF_USERMODE(framep)); #endif + if (profprocs != 0) + profclock(TRAPF_USERMODE(framep), TRAPF_PC(framep)); + + /* divide hz (1024) by 8 to get stathz (128) */ + if ((schedclk2 & 0x7) == 0) + statclock(TRAPF_USERMODE(framep)); critical_exit(); } } ==== //depot/projects/smpng/sys/alpha/include/_types.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,6 +43,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __PCI_REROUTE_INTERRUPT + /* * Basic types upon which most other types are built. */ ==== //depot/projects/smpng/sys/alpha/include/cpu.h#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.42 2005/01/05 20:05:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.43 2005/12/22 22:16:04 jhb Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /*- @@ -48,21 +48,10 @@ #include <machine/frame.h> -/* - * Arguments to hardclock and gatherstats encapsulate the previous - * machine state in an opaque clockframe. One the Alpha, we use - * what we push on an interrupt (a trapframe). - */ -struct clockframe { - struct trapframe cf_tf; -}; #define TRAPF_USERMODE(framep) \ (((framep)->tf_regs[FRAME_PS] & ALPHA_PSL_USERMODE) != 0) #define TRAPF_PC(framep) ((framep)->tf_regs[FRAME_PC]) -#define CLKF_USERMODE(framep) TRAPF_USERMODE(&(framep)->cf_tf) -#define CLKF_PC(framep) TRAPF_PC(&(framep)->cf_tf) - /* * CTL_MACHDEP definitions. */ ==== //depot/projects/smpng/sys/alpha/include/cpuconf.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpuconf.h,v 1.14 2005/01/31 23:07:42 ticso Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpuconf.h,v 1.15 2005/12/22 22:16:04 jhb Exp $ */ /* $NetBSD: cpuconf.h,v 1.7 1997/11/06 00:42:03 thorpej Exp $ */ #ifndef _ALPHA_CPUCONF_H #define _ALPHA_CPUCONF_H @@ -68,7 +68,7 @@ void (*cons_init)(void); void (*device_register)(struct device *, void *); void (*iointr)(void *, unsigned long); - void (*clockintr)(void *); + void (*clockintr)(int, uintfptr_t); void (*mcheck_handler)(unsigned long, struct trapframe *, unsigned long, unsigned long); void (*cpu_idle)(void); ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.97 2005/12/15 16:30:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.98 2005/12/26 21:23:56 sobomax Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -206,6 +206,7 @@ "/lib/ld-linux.so.1", &elf_linux_sysvec, NULL, + BI_CAN_EXEC_DYN, }; static Elf64_Brandinfo linux_glibc2brand = { @@ -216,6 +217,7 @@ "/lib/ld-linux.so.2", &elf_linux_sysvec, NULL, + BI_CAN_EXEC_DYN, }; Elf64_Brandinfo *linux_brandlist[] = { ==== //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.3 2005/12/06 07:22:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $"); #include "opt_bpf.h" @@ -103,6 +103,10 @@ */ emit_func emitm; + /* Do not compile an empty filter. */ + if (nins == 0) + return NULL; + /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.71 2005/12/08 18:33:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.73 2005/12/27 23:23:47 pjd Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -180,7 +180,7 @@ * Stack trace. */ #define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) < DMAP_MAX_ADDRESS) \ - || (va) >= KERNBASE) + || ((va) >= KERNBASE && (va) < VM_MAX_KERNEL_ADDRESS)) struct amd64_frame { struct amd64_frame *f_frame; @@ -199,8 +199,8 @@ static void decode_syscall(int, struct thread *); static char * watchtype_str(int type); -int amd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, - struct dbreg * d); +int amd64_set_watch(int watchnum, unsigned long watchaddr, int size, + int access, struct dbreg * d); int amd64_clr_watch(int watchnum, struct dbreg * d); /* @@ -515,6 +515,10 @@ break; if (stack_put(st, callpc) == -1) break; + if (frame->f_frame <= frame || + (vm_offset_t)frame->f_frame >= + (vm_offset_t)rbp + KSTACK_PAGES * PAGE_SIZE) + break; frame = frame->f_frame; } } @@ -522,7 +526,7 @@ int amd64_set_watch(watchnum, watchaddr, size, access, d) int watchnum; - unsigned int watchaddr; + unsigned long watchaddr; int size; int access; struct dbreg * d; ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.24 2005/12/18 04:52:35 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -82,6 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -96,6 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#16 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.141 2005/11/17 02:32:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.143 2006/01/01 05:35:57 netchild Exp $"); #include "opt_cpu.h" @@ -69,6 +69,8 @@ static void print_AMD_info(void); static void print_AMD_assoc(int i); +void setPQL2(int *const size, int *const ways); +static void setPQL2_AMD(int *const size, int *const ways); int cpu_class; char machine[] = "amd64"; @@ -93,6 +95,9 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +extern int pq_l2size; +extern int pq_l2nways; + void printcpuinfo(void) { @@ -526,3 +531,30 @@ print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } + +static void +setPQL2_AMD(int *const size, int *const ways) +{ + if (cpu_exthigh >= 0x80000006) { + u_int regs[4]; + + do_cpuid(0x80000006, regs); + *size = regs[2] >> 16; + *ways = (regs[2] >> 12) & 0x0f; + switch (*ways) { + case 0: /* disabled/not present */ + case 15: /* fully associative */ + default: *ways = 1; break; /* reserved configuration */ + case 4: *ways = 4; break; + case 6: *ways = 8; break; + case 8: *ways = 16; break; + } + } +} + +void +setPQL2(int *const size, int *const ways) +{ + if (strcmp(cpu_vendor, "AuthenticAMD") == 0) + setPQL2_AMD(size, ways); +} ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#19 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.22 2005/12/13 18:29:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.23 2005/12/22 22:16:05 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -51,6 +51,7 @@ #include <vm/pmap.h> #include <machine/apicreg.h> +#include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/frame.h> #include <machine/intr_machdep.h> @@ -617,7 +618,7 @@ } void -lapic_handle_timer(struct clockframe frame) +lapic_handle_timer(struct trapframe frame) { struct lapic *la; @@ -634,16 +635,16 @@ if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(&frame); + hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); else - hardclock_process(&frame); + hardclock_cpu(TRAPF_USERMODE(&frame)); } /* Fire statclock at stathz. */ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - statclock(&frame); + statclock(TRAPF_USERMODE(&frame)); } /* Fire profclock at profhz, but only when needed. */ @@ -651,7 +652,7 @@ if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; if (profprocs != 0) - profclock(&frame); + profclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); } critical_exit(); } ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.266 2005/12/08 18:33:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.267 2005/12/22 22:16:05 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -917,7 +917,7 @@ } void -ipi_bitmap_handler(struct clockframe frame) +ipi_bitmap_handler(struct trapframe frame) { int cpu = PCPU_GET(cpuid); u_int ipi_bitmap; ==== //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.3 2005/09/18 01:42:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.4 2006/01/06 19:22:18 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,13 +100,10 @@ { 0, 0 } }; -static driver_t mptable_hostb_driver = { - "pcib", - mptable_hostb_methods, - 1, -}; +static devclass_t hostb_devclass; -DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, pcib_devclass, 0, 0); +DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); +DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); /* PCI to PCI bridge driver. */ @@ -155,11 +152,9 @@ {0, 0} }; -static driver_t mptable_pcib_driver = { - "pcib", - mptable_pcib_pci_methods, - sizeof(struct pcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, + sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#40 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.298 2005/12/09 13:30:34 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.299 2006/01/06 18:02:11 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -220,10 +220,10 @@ printf("kernel trap %d with interrupts disabled\n", type); /* - * We shouldn't enable interrupts while in a critical - * section or servicing an NMI. + * We shouldn't enable interrupts while holding a + * spin lock or servicing an NMI. */ - if (type != T_NMI && td->td_critnest == 0) + if (type != T_NMI && td->td_md.md_spinlock_count == 0) enable_intr(); } } ==== //depot/projects/smpng/sys/amd64/include/_types.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.9 2005/07/02 23:13:30 thompsa Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.10 2006/01/01 20:59:27 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -44,6 +44,8 @@ #endif #define __NO_STRICT_ALIGNMENT +#define __HAVE_ACPI +#define __PCI_REROUTE_INTERRUPT /* * Basic types upon which most other types are built. ==== //depot/projects/smpng/sys/amd64/include/apicvar.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.15 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.16 2005/12/22 22:16:05 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -202,7 +202,7 @@ void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); void lapic_handle_intr(int vector, struct trapframe frame); -void lapic_handle_timer(struct clockframe frame); +void lapic_handle_timer(struct trapframe frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); ==== //depot/projects/smpng/sys/amd64/include/clock.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.50 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.51 2005/12/22 22:16:05 jhb Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -29,7 +29,6 @@ /* * Driver to clock driver interface. */ -struct clockframe; int acquire_timer2(int mode); int release_timer2(void); ==== //depot/projects/smpng/sys/amd64/include/cpu.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.74 2004/08/03 18:44:26 mux Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.75 2005/12/22 22:16:05 jhb Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601062021.k06KLujL041410>