From owner-p4-projects@FreeBSD.ORG Sun Jun 17 10:51:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4656316A46B; Sun, 17 Jun 2007 10:51:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 039CE16A400 for ; Sun, 17 Jun 2007 10:51:12 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E671113C44B for ; Sun, 17 Jun 2007 10:51:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5HApBws058606 for ; Sun, 17 Jun 2007 10:51:11 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5HAp9m1058407 for perforce@freebsd.org; Sun, 17 Jun 2007 10:51:09 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 17 Jun 2007 10:51:09 GMT Message-Id: <200706171051.l5HAp9m1058407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 121844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jun 2007 10:51:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=121844 Change 121844 by rpaulo@rpaulo_epsilon on 2007/06/17 10:50:09 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/amd64/isa/clock.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/arm/include/intr.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/common/main.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#13 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files.sparc64#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/advansys/advansys.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/advansys/advlib.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/advansys/adwcam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aha/aha.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ahb/ahb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ahb/ahbreg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic_isa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic/aicvar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/amd/amd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/amr/amr_cam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/asr/asr.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/atkbdc/psm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bce.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/buslogic/bt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/boot_font.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/creator.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/gallant12x22.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/gallant12x22.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/gfb.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/fb/machfb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/sbp.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/gem/if_gem.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/hptmv/entry.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iir/iir.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iir/iir.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iir/iir_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mly/mly.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ofw/openfirm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ofw/openfirm.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccard/pccard.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ppbus/vpo.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/re/if_re.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/rr232x/osm_bsd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/ess.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/mss.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/sb8.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/emu10kx-pcm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/ich.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/solo.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/dsp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/feeder_volume.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sound/version.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/trm/trm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umass.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_port.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_subr.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/wds/wd7000.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vfsops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/i386/cpufreq/smist.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/isa/clock.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_descrip.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_fork.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_priv.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/sched_ule.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/subr_witness.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/tmpfs/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/igmp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/in.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_dummynet.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_auth.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/udp_usrreq.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ah_output.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netipsec/key.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netsmb/smb_smb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/pci/if_ste.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/pci/ncr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/powerpc/include/vmparam.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/rpc/rpcclnt.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/smp.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/trap.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/priv.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/tree.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_contig.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_object.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageq.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_phys.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.82 2007/06/11 17:57:24 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.83 2007/06/17 04:21:58 mjacob Exp $"); #include #include @@ -841,7 +841,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - bus_addr_t lastaddr; + bus_addr_t lastaddr = 0; int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; ==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.587 2007/05/31 22:52:10 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.588 2007/06/17 04:27:45 mjacob Exp $"); /* * Manages physical address maps. @@ -1645,6 +1645,9 @@ continue; pmap->pm_stats.resident_count--; pte = pmap_pte_pde(pmap, va, &ptepde); + if (pte == NULL) { + panic("null pte in pmap_collect"); + } tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, ("pmap_collect: wired pte %#lx", tpte)); @@ -2060,6 +2063,9 @@ PMAP_LOCK(pmap); pmap->pm_stats.resident_count--; pte = pmap_pte_pde(pmap, pv->pv_va, &ptepde); + if (pte == NULL) { + panic("null pte in pmap_remove_all"); + } tpte = pte_load_clear(pte); if (tpte & PG_W) pmap->pm_stats.wired_count--; ==== //depot/projects/soc2007/rpaulo-macbook/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.231 2007/06/04 18:25:02 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.232 2007/06/15 22:58:14 peter Exp $"); /* * Routines to handle clock hardware. @@ -53,12 +53,15 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include @@ -931,4 +934,100 @@ DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0); DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0); + +/* + * Linux-style /dev/nvram driver + * + * cmos ram starts at bytes 14 through 128, for a total of 114 bytes. + * bytes 16 through 31 are checksummed at byte 32. + * Unlike Linux, you have to take care of the checksums yourself. + * The driver exposes byte 14 as file offset 0. + */ + +#define NVRAM_FIRST RTC_DIAG /* 14 */ +#define NVRAM_LAST 128 + +static d_open_t nvram_open; +static d_read_t nvram_read; +static d_write_t nvram_write; + +static struct cdev *nvram_dev; + +static struct cdevsw nvram_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, + .d_open = nvram_open, + .d_read = nvram_read, + .d_write = nvram_write, + .d_name = "nvram", +}; + +static int +nvram_open(struct cdev *dev __unused, int flags, int fmt __unused, + struct thread *td) +{ + int error = 0; + + if (flags & FWRITE) + error = securelevel_gt(td->td_ucred, 0); + + return (error); +} + +static int +nvram_read(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + v = rtcin(nv_off); + error = uiomove(&v, 1, uio); + } + return (error); + +} + +static int +nvram_write(struct cdev *dev, struct uio *uio, int flags) +{ + int nv_off; + u_char v; + int error = 0; + + while (uio->uio_resid > 0 && error == 0) { + nv_off = uio->uio_offset + NVRAM_FIRST; + if (nv_off < NVRAM_FIRST || nv_off >= NVRAM_LAST) + return (0); /* Signal EOF */ + /* Single byte at a time */ + error = uiomove(&v, 1, uio); + writertc(nv_off, v); + } + return (error); +} + +static int +nvram_modevent(module_t mod __unused, int type, void *data __unused) +{ + switch (type) { + case MOD_LOAD: + nvram_dev = make_dev(&nvram_cdevsw, 0, + UID_ROOT, GID_KMEM, 0640, "nvram"); + break; + case MOD_UNLOAD: + case MOD_SHUTDOWN: + destroy_dev(nvram_dev); + break; + default: + return (EOPNOTSUPP); + } + return (0); +} +DEV_MODULE(nvram, nvram_modevent, NULL); + #endif /* DEV_ISA */ ==== //depot/projects/soc2007/rpaulo-macbook/arm/include/intr.h#2 (text+ko) ==== @@ -32,14 +32,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.6 2007/02/23 12:18:27 piso Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.7 2007/06/16 15:03:33 cognet Exp $ * */ #ifndef _MACHINE_INTR_H_ #define _MACHINE_INTR_H_ -#ifdef CPU_ARM9 +#ifdef CPU_XSCALE_81342 +#define NIRQ 128 +#elif defined(CPU_ARM9) #define NIRQ 64 #else #define NIRQ 32 ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/common/main.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.8 2006/11/02 00:26:45 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.9 2007/06/17 00:17:15 marius Exp $"); #include #include "openfirm.h" @@ -41,7 +41,6 @@ extern char bootprog_date[]; extern char bootprog_maker[]; -phandle_t chosen; u_int32_t acells; static char bootargs[128]; @@ -64,24 +63,22 @@ uint64_t memsize(void) { - ihandle_t meminstance; - phandle_t memory; + phandle_t memoryp; struct ofw_reg reg[4]; struct ofw_reg2 reg2[8]; int i; u_int64_t sz, memsz; - OF_getprop(chosen, "memory", &meminstance, sizeof(meminstance)); - memory = OF_instance_to_package(meminstance); + memoryp = OF_instance_to_package(memory); if (acells == 1) { - sz = OF_getprop(memory, "reg", ®, sizeof(reg)); + sz = OF_getprop(memoryp, "reg", ®, sizeof(reg)); sz /= sizeof(struct ofw_reg); for (i = 0, memsz = 0; i < sz; i++) memsz += reg[i].size; } else if (acells == 2) { - sz = OF_getprop(memory, "reg", ®2, sizeof(reg2)); + sz = OF_getprop(memoryp, "reg", ®2, sizeof(reg2)); sz /= sizeof(struct ofw_reg2); for (i = 0, memsz = 0; i < sz; i++) @@ -107,7 +104,6 @@ OF_init(openfirm); root = OF_finddevice("/"); - chosen = OF_finddevice("/chosen"); acells = 1; OF_getprop(root, "#address-cells", &acells, sizeof(acells)); ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.10 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.11 2007/06/17 00:17:15 marius Exp $ LIB= ofw INTERNALLIB= SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ - ofw_time.c openfirm.c openfirm_mmu.c + ofw_time.c openfirm.c CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_console.c#2 (text+ko) ==== @@ -27,15 +27,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.11 2005/10/20 10:39:09 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_console.c,v 1.12 2007/06/17 00:17:15 marius Exp $"); #include #include "bootstrap.h" #include "openfirm.h" -int console; - static void ofw_cons_probe(struct console *cp); static int ofw_cons_init(int); void ofw_cons_putchar(int); @@ -59,10 +57,7 @@ static void ofw_cons_probe(struct console *cp) { - phandle_t chosen; - if ((chosen = OF_finddevice("/chosen")) == -1) - OF_exit(); OF_getprop(chosen, "stdin", &stdin, sizeof(stdin)); OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)); cp->c_flags |= C_PRESENTIN|C_PRESENTOUT; ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/ofw_net.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.10 2005/03/02 20:12:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.11 2007/06/17 00:17:15 marius Exp $"); #include #include @@ -179,12 +179,11 @@ static void ofwn_init(struct iodesc *desc, void *machdep_hint) { - phandle_t chosen, netdev; + phandle_t netdev; char path[64]; char *ch; int pathlen; - chosen = OF_finddevice("/chosen"); pathlen = OF_getprop(chosen, "bootpath", path, 64); if ((ch = index(path, ':')) != NULL) *ch = '\0'; ==== //depot/projects/soc2007/rpaulo-macbook/boot/ofw/libofw/openfirm.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.13 2006/10/09 04:43:07 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.15 2007/06/17 00:17:15 marius Exp $"); #include @@ -66,39 +66,24 @@ int (*openfirmware)(void *); +phandle_t chosen; ihandle_t mmu; ihandle_t memory; -/* Initialiaser */ +/* Initialiser */ void OF_init(int (*openfirm)(void *)) { - phandle_t chosen; openfirmware = openfirm; - chosen = OF_finddevice("/chosen"); - OF_getprop(chosen, "memory", &memory, sizeof(memory)); - if (memory == 0) - panic("failed to get memory ihandle"); - OF_getprop(chosen, "mmu", &mmu, sizeof(mmu)); - if (mmu == 0) - panic("failed to get mmu ihandle"); -} - -phandle_t -OF_chosennode(void) -{ - static phandle_t chosen; - - if (chosen) - return (chosen); - - if ((chosen = OF_finddevice("/chosen")) == -1) - OF_exit(); - - return (chosen); + if ((chosen = OF_finddevice("/chosen")) == -1) + OF_exit(); + if (OF_getprop(chosen, "memory", &memory, sizeof(memory)) == -1) + OF_exit(); + if (OF_getprop(chosen, "mmu", &mmu, sizeof(mmu)) == -1) + OF_exit(); } /* @@ -110,23 +95,21 @@ OF_test(char *name) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t service; - cell_t missing; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t service; + cell_t missing; } args = { (cell_t)"test", 1, 1, - 0, - 0 }; args.service = (cell_t)name; if (openfirmware(&args) == -1) - return -1; - return (int)args.missing; + return (-1); + return (args.missing); } /* Return firmware millisecond count. */ @@ -134,19 +117,18 @@ OF_milliseconds() { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t ms; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t ms; } args = { (cell_t)"milliseconds", 0, 1, - 0 }; - + openfirmware(&args); - return (int)args.ms; + return (args.ms); } /* @@ -158,23 +140,21 @@ OF_peer(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t next; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t next; } args = { (cell_t)"peer", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.next; + return (-1); + return (args.next); } /* Return the first child of this node or 0. */ @@ -182,23 +162,21 @@ OF_child(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t child; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t child; } args = { (cell_t)"child", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.child; + return (-1); + return (args.child); } /* Return the parent of this node or 0. */ @@ -206,23 +184,21 @@ OF_parent(phandle_t node) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t node; - cell_t parent; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t node; + cell_t parent; } args = { (cell_t)"parent", 1, 1, - 0, - 0 }; - args.node = (u_int)node; + args.node = node; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.parent; + return (-1); + return (args.parent); } /* Return the package handle that corresponds to an instance handle. */ @@ -230,23 +206,21 @@ OF_instance_to_package(ihandle_t instance) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t instance; - cell_t package; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t instance; + cell_t package; } args = { (cell_t)"instance-to-package", 1, 1, - 0, - 0 }; - - args.instance = (u_int)instance; + + args.instance = instance; if (openfirmware(&args) == -1) - return -1; - return (phandle_t)args.package; + return (-1); + return (args.package); } /* Get the length of a property of a package. */ @@ -254,26 +228,23 @@ OF_getproplen(phandle_t package, char *propname) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t proplen; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t proplen; } args = { (cell_t)"getproplen", 2, 1, - 0, - 0, - 0 }; - args.package = (u_int)package; + args.package = package; args.propname = (cell_t)propname; if (openfirmware(&args) == -1) - return -1; - return (int)args.proplen; + return (-1); + return (args.proplen); } /* Get the value of a property of a package. */ @@ -281,32 +252,27 @@ OF_getprop(phandle_t package, char *propname, void *buf, int buflen) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t buf; - cell_t buflen; - cell_t size; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t buf; + cell_t buflen; + cell_t size; } args = { (cell_t)"getprop", 4, 1, - 0, - 0, - 0, - 0, - 0 }; - - args.package = (u_int)package; + + args.package = package; args.propname = (cell_t)propname; args.buf = (cell_t)buf; - args.buflen = (u_int)buflen; + args.buflen = buflen; if (openfirmware(&args) == -1) - return -1; - return (int)args.size; + return (-1); + return (args.size); } /* Get the next property of a package. */ @@ -314,29 +280,25 @@ OF_nextprop(phandle_t package, char *previous, char *buf) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t previous; - cell_t buf; - cell_t flag; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t previous; + cell_t buf; + cell_t flag; } args = { (cell_t)"nextprop", 3, 1, - 0, - 0, - 0, - 0 }; - args.package = (u_int)package; + args.package = package; args.previous = (cell_t)previous; args.buf = (cell_t)buf; if (openfirmware(&args) == -1) - return -1; - return (int)args.flag; + return (-1); + return (args.flag); } /* Set the value of a property of a package. */ @@ -345,32 +307,27 @@ OF_setprop(phandle_t package, char *propname, void *buf, int len) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t package; - cell_t propname; - cell_t buf; - cell_t len; - cell_t size; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t package; + cell_t propname; + cell_t buf; + cell_t len; + cell_t size; } args = { (cell_t)"setprop", 4, 1, - 0, - 0, - 0, - 0, - 0 }; - - args.package = (u_int)package; + + args.package = package; args.propname = (cell_t)propname; args.buf = (cell_t)buf; - args.len = (u_int)len; + args.len = len; if (openfirmware(&args) == -1) - return -1; - return (int)args.size; + return (-1); + return (args.size); } /* Convert a device specifier to a fully qualified pathname. */ @@ -378,29 +335,25 @@ OF_canon(const char *device, char *buf, int len) { static struct { - cell_t name; - cell_t nargs; - cell_t nreturns; - cell_t device; - cell_t buf; - cell_t len; - cell_t size; + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t device; + cell_t buf; + cell_t len; + cell_t size; } args = { (cell_t)"canon", 3, 1, - 0, - 0, - 0, - 0 }; - + args.device = (cell_t)device; args.buf = (cell_t)buf; - args.len = (cell_t)len; >>> TRUNCATED FOR MAIL (1000 lines) <<<