From owner-p4-projects@FreeBSD.ORG Tue May 23 01:59:30 2006 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 9E53A16A5EE; Tue, 23 May 2006 01:59:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D3CC16A4F4 for ; Tue, 23 May 2006 01:59:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0422443D46 for ; Tue, 23 May 2006 01:59:30 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4N1wjX2070963 for ; Tue, 23 May 2006 01:58:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4N1wduq070960 for perforce@freebsd.org; Tue, 23 May 2006 01:58:39 GMT (envelope-from marcel@freebsd.org) Date: Tue, 23 May 2006 01:58:39 GMT Message-Id: <200605230158.k4N1wduq070960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 97657 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: Tue, 23 May 2006 01:59:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=97657 Change 97657 by marcel@marcel_nfs on 2006/05/23 01:57:48 IFC @97656 Affected files ... .. //depot/projects/uart/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/uart/amd64/conf/GENERIC#20 integrate .. //depot/projects/uart/amd64/conf/NOTES#9 integrate .. //depot/projects/uart/amd64/include/clock.h#7 integrate .. //depot/projects/uart/amd64/include/mutex.h#3 integrate .. //depot/projects/uart/arm/arm/machdep.c#10 integrate .. //depot/projects/uart/arm/at91/at91.c#5 integrate .. //depot/projects/uart/arm/at91/at91_st.c#3 integrate .. //depot/projects/uart/arm/at91/if_ate.c#4 integrate .. //depot/projects/uart/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/uart/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/uart/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/uart/arm/conf/KB920X#2 integrate .. //depot/projects/uart/arm/conf/SIMICS#6 integrate .. //depot/projects/uart/arm/conf/SKYEYE#2 integrate .. //depot/projects/uart/arm/include/_types.h#5 integrate .. //depot/projects/uart/arm/include/atomic.h#9 integrate .. //depot/projects/uart/arm/include/pmap.h#10 integrate .. //depot/projects/uart/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_io.c#4 integrate .. //depot/projects/uart/arm/sa11x0/sa11x0_reg.h#2 integrate .. //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_space.c#5 integrate .. //depot/projects/uart/boot/forth/loader.conf#10 integrate .. //depot/projects/uart/boot/pc98/Makefile#2 integrate .. //depot/projects/uart/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/uart/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/uart/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/uart/cam/cam_debug.h#3 integrate .. //depot/projects/uart/coda/cnode.h#6 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#11 integrate .. //depot/projects/uart/compat/ndis/subr_hal.c#7 integrate .. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/uart/conf/NOTES#38 integrate .. //depot/projects/uart/conf/files#69 integrate .. //depot/projects/uart/conf/files.amd64#23 integrate .. //depot/projects/uart/conf/files.i386#28 integrate .. //depot/projects/uart/conf/files.pc98#24 integrate .. //depot/projects/uart/conf/options#36 integrate .. //depot/projects/uart/conf/options.arm#7 integrate .. //depot/projects/uart/conf/options.i386#15 integrate .. //depot/projects/uart/contrib/dev/oltr/if_oltr.c#8 integrate .. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#11 integrate .. //depot/projects/uart/dev/acpica/acpi.c#23 integrate .. //depot/projects/uart/dev/aic7xxx/aic79xx_osm.h#8 integrate .. //depot/projects/uart/dev/aic7xxx/aic7xxx_osm.h#8 integrate .. //depot/projects/uart/dev/an/if_an.c#12 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/uart/dev/arl/if_arl.c#4 integrate .. //depot/projects/uart/dev/arl/if_arl_isa.c#4 integrate .. //depot/projects/uart/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/uart/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/uart/dev/bge/if_bge.c#26 integrate .. //depot/projects/uart/dev/ciss/ciss.c#16 integrate .. //depot/projects/uart/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/uart/dev/cpufreq/ichss.c#2 integrate .. //depot/projects/uart/dev/ct/bshw_machdep.c#5 integrate .. //depot/projects/uart/dev/ctau/if_ct.c#6 integrate .. //depot/projects/uart/dev/cx/if_cx.c#5 integrate .. //depot/projects/uart/dev/dpt/dpt_scsi.c#7 integrate .. //depot/projects/uart/dev/drm/drm.h#8 integrate .. //depot/projects/uart/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/uart/dev/drm/i915_drv.c#4 integrate .. //depot/projects/uart/dev/drm/mga_drv.c#8 integrate .. //depot/projects/uart/dev/drm/r300_cmdbuf.c#4 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#12 integrate .. //depot/projects/uart/dev/em/if_em_hw.c#9 integrate .. //depot/projects/uart/dev/fb/boot_font.c#6 integrate .. //depot/projects/uart/dev/fb/gfb.c#6 integrate .. //depot/projects/uart/dev/fxp/if_fxp.c#23 integrate .. //depot/projects/uart/dev/gfb/gfb_pci.c#8 integrate .. //depot/projects/uart/dev/hifn/hifn7751.c#13 integrate .. //depot/projects/uart/dev/hifn/hifn7751var.h#6 integrate .. //depot/projects/uart/dev/hptmv/entry.c#6 integrate .. //depot/projects/uart/dev/ic/ns16550.h#5 integrate .. //depot/projects/uart/dev/idt/idt.c#6 integrate .. //depot/projects/uart/dev/ie/if_ie_isa.c#6 integrate .. //depot/projects/uart/dev/iir/iir.c#9 integrate .. //depot/projects/uart/dev/iir/iir_pci.c#11 integrate .. //depot/projects/uart/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/uart/dev/ips/ips.c#8 integrate .. //depot/projects/uart/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#15 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/uart/dev/isp/isp_pci.c#13 integrate .. //depot/projects/uart/dev/isp/isp_tpublic.h#7 integrate .. //depot/projects/uart/dev/isp/ispvar.h#11 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#9 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb.h#6 integrate .. //depot/projects/uart/dev/ixgb/if_ixgb_osdep.h#4 integrate .. //depot/projects/uart/dev/le/am7990.c#3 integrate .. //depot/projects/uart/dev/le/am79900.c#3 integrate .. //depot/projects/uart/dev/le/if_le_cbus.c#1 branch .. //depot/projects/uart/dev/le/if_le_isa.c#1 branch .. //depot/projects/uart/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/uart/dev/le/if_le_pci.c#2 integrate .. //depot/projects/uart/dev/le/lance.c#2 integrate .. //depot/projects/uart/dev/le/lancereg.h#2 integrate .. //depot/projects/uart/dev/le/lancevar.h#2 integrate .. //depot/projects/uart/dev/lge/if_lge.c#13 integrate .. //depot/projects/uart/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/uart/dev/lnc/if_lnc.c#7 delete .. //depot/projects/uart/dev/lnc/if_lnc_cbus.c#8 delete .. //depot/projects/uart/dev/lnc/if_lnc_isa.c#7 delete .. //depot/projects/uart/dev/lnc/if_lnc_pci.c#9 delete .. //depot/projects/uart/dev/lnc/if_lncreg.h#2 delete .. //depot/projects/uart/dev/lnc/if_lncvar.h#4 delete .. //depot/projects/uart/dev/mfi/mfi.c#4 integrate .. //depot/projects/uart/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/uart/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/uart/dev/mfi/mfi_linux.c#1 branch .. //depot/projects/uart/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/uart/dev/mfi/mfireg.h#2 integrate .. //depot/projects/uart/dev/mfi/mfivar.h#2 integrate .. //depot/projects/uart/dev/mii/brgphy.c#14 integrate .. //depot/projects/uart/dev/mii/ciphy.c#4 integrate .. //depot/projects/uart/dev/mii/e1000phy.c#6 integrate .. //depot/projects/uart/dev/mii/mii_physubr.c#6 integrate .. //depot/projects/uart/dev/mii/miivar.h#3 integrate .. //depot/projects/uart/dev/mii/nsgphy.c#6 integrate .. //depot/projects/uart/dev/mii/rgephy.c#6 integrate .. //depot/projects/uart/dev/mii/tdkphy.c#6 integrate .. //depot/projects/uart/dev/mii/ukphy_subr.c#4 integrate .. //depot/projects/uart/dev/mpt/mpt.h#12 integrate .. //depot/projects/uart/dev/mse/mse.c#5 integrate .. //depot/projects/uart/dev/mse/mse_cbus.c#4 integrate .. //depot/projects/uart/dev/mse/mse_isa.c#4 integrate .. //depot/projects/uart/dev/my/if_my.c#9 integrate .. //depot/projects/uart/dev/myri10ge/if_myri10ge.c#2 integrate .. //depot/projects/uart/dev/ncv/ncr53c500.c#6 integrate .. //depot/projects/uart/dev/nge/if_nge.c#14 integrate .. //depot/projects/uart/dev/nsp/nsp.c#6 integrate .. //depot/projects/uart/dev/nve/if_nve.c#6 integrate .. //depot/projects/uart/dev/pbio/pbio.c#6 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#18 integrate .. //depot/projects/uart/dev/pccbb/pccbb_pci.c#8 integrate .. //depot/projects/uart/dev/pdq/pdq_freebsd.h#7 integrate .. //depot/projects/uart/dev/pdq/pdqvar.h#5 integrate .. //depot/projects/uart/dev/ppbus/vpoio.c#3 integrate .. //depot/projects/uart/dev/ral/if_ral_pci.c#4 integrate .. //depot/projects/uart/dev/ral/rt2560.c#3 integrate .. //depot/projects/uart/dev/ral/rt2661.c#4 integrate .. //depot/projects/uart/dev/rr232x/os_bsd.h#3 integrate .. //depot/projects/uart/dev/safe/safe.c#8 integrate .. //depot/projects/uart/dev/safe/safevar.h#2 integrate .. //depot/projects/uart/dev/sbsh/if_sbsh.c#9 integrate .. //depot/projects/uart/dev/sk/if_sk.c#7 integrate .. //depot/projects/uart/dev/sk/if_skreg.h#5 integrate .. //depot/projects/uart/dev/sound/pcm/sound.h#10 integrate .. //depot/projects/uart/dev/stg/tmc18c30.c#6 integrate .. //depot/projects/uart/dev/syscons/scvesactl.c#6 integrate .. //depot/projects/uart/dev/syscons/syscons.c#14 integrate .. //depot/projects/uart/dev/trm/trm.c#12 integrate .. //depot/projects/uart/dev/tx/if_tx.c#13 integrate .. //depot/projects/uart/dev/txp/if_txp.c#12 integrate .. //depot/projects/uart/dev/uart/uart_dev_ns8250.c#44 integrate .. //depot/projects/uart/dev/ubsec/ubsec.c#10 integrate .. //depot/projects/uart/dev/ubsec/ubsecvar.h#3 integrate .. //depot/projects/uart/dev/usb/ehci.c#16 integrate .. //depot/projects/uart/dev/usb/if_ural.c#7 integrate .. //depot/projects/uart/dev/usb/ohci.c#17 integrate .. //depot/projects/uart/dev/usb/uhci.c#16 integrate .. //depot/projects/uart/dev/usb/usb.c#11 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#16 integrate .. //depot/projects/uart/dev/usb/usbdi.c#10 integrate .. //depot/projects/uart/dev/wds/wd7000.c#5 integrate .. //depot/projects/uart/dev/wi/if_wi.c#15 integrate .. //depot/projects/uart/dev/wi/if_wi_pci.c#11 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vfsops.c#9 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.c#6 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.h#5 integrate .. //depot/projects/uart/fs/smbfs/smbfs_subr.c#5 integrate .. //depot/projects/uart/i386/conf/GENERIC#19 integrate .. //depot/projects/uart/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/uart/i386/conf/NOTES#20 integrate .. //depot/projects/uart/i386/conf/PAE#11 integrate .. //depot/projects/uart/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/uart/i386/include/clock.h#10 integrate .. //depot/projects/uart/i386/include/mutex.h#2 integrate .. //depot/projects/uart/i386/include/pcpu.h#7 integrate .. //depot/projects/uart/i386/include/pcvt_ioctl.h#4 delete .. //depot/projects/uart/i386/include/privatespace.h#2 integrate .. //depot/projects/uart/i386/isa/npx.c#12 integrate .. //depot/projects/uart/i386/isa/pcvt/pcvt_conf.h#3 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_drv.c#8 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_ext.c#4 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_hdr.h#7 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_kbd.c#4 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_kbd.h#3 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_out.c#3 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_sup.c#4 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_tbl.h#3 delete .. //depot/projects/uart/i386/isa/pcvt/pcvt_vtf.c#4 delete .. //depot/projects/uart/i386/isa/spic.c#5 integrate .. //depot/projects/uart/i4b/capi/iavc/iavc_card.c#3 integrate .. //depot/projects/uart/i4b/capi/iavc/iavc_isa.c#4 integrate .. //depot/projects/uart/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/uart/i4b/capi/iavc/iavc_pci.c#5 integrate .. //depot/projects/uart/i4b/layer1/itjc/i4b_itjc_isac.c#3 integrate .. //depot/projects/uart/i4b/layer1/itjc/i4b_itjc_l1.c#3 integrate .. //depot/projects/uart/i4b/layer1/itjc/i4b_itjc_l1fsm.c#3 integrate .. //depot/projects/uart/i4b/layer1/itjc/i4b_itjc_pci.c#9 integrate .. //depot/projects/uart/ia64/conf/GENERIC#11 integrate .. //depot/projects/uart/ia64/ia64/mp_machdep.c#11 integrate .. //depot/projects/uart/ia64/ia64/trap.c#15 integrate .. //depot/projects/uart/ia64/ia64/vm_machdep.c#14 integrate .. //depot/projects/uart/kern/init_main.c#15 integrate .. //depot/projects/uart/kern/kern_conf.c#11 integrate .. //depot/projects/uart/kern/kern_mutex.c#13 integrate .. //depot/projects/uart/kern/kern_umtx.c#14 integrate .. //depot/projects/uart/kern/vfs_mount.c#23 integrate .. //depot/projects/uart/kern/vfs_vnops.c#19 integrate .. //depot/projects/uart/modules/Makefile#35 integrate .. //depot/projects/uart/modules/le/Makefile#2 integrate .. //depot/projects/uart/modules/lnc/Makefile#3 delete .. //depot/projects/uart/modules/mfi/Makefile#2 integrate .. //depot/projects/uart/modules/mfi/mfi_linux/Makefile#1 branch .. //depot/projects/uart/net/if_bridge.c#9 integrate .. //depot/projects/uart/net/if_tap.c#9 integrate .. //depot/projects/uart/net/net_osdep.h#5 integrate .. //depot/projects/uart/net/route.c#9 integrate .. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket.h#4 integrate .. //depot/projects/uart/netgraph/bluetooth/include/ng_hci.h#4 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#7 integrate .. //depot/projects/uart/netgraph/ng_socket.c#11 integrate .. //depot/projects/uart/netinet/in.h#10 integrate .. //depot/projects/uart/netinet/ip_fw2.c#22 integrate .. //depot/projects/uart/netinet/ip_gre.c#6 integrate .. //depot/projects/uart/netinet/ip_mroute.c#11 integrate .. //depot/projects/uart/netinet/ip_output.c#16 integrate .. //depot/projects/uart/netinet/ip_var.h#10 integrate .. //depot/projects/uart/netinet/raw_ip.c#16 integrate .. //depot/projects/uart/netinet/tcp_timer.c#13 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#18 integrate .. //depot/projects/uart/netinet6/in6_src.c#10 integrate .. //depot/projects/uart/netinet6/ip6_forward.c#10 integrate .. //depot/projects/uart/netinet6/ip6_input.c#12 integrate .. //depot/projects/uart/netinet6/ip6_output.c#13 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/uart/netipsec/key.c#8 integrate .. //depot/projects/uart/netipsec/xform_ah.c#8 integrate .. //depot/projects/uart/netipsec/xform_esp.c#9 integrate .. //depot/projects/uart/nfs4client/nfs4_dev.c#4 integrate .. //depot/projects/uart/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/uart/nfsclient/nfs.h#6 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#13 integrate .. //depot/projects/uart/nfsclient/nfs_nfsiod.c#7 integrate .. //depot/projects/uart/nfsclient/nfs_node.c#11 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#12 integrate .. //depot/projects/uart/nfsclient/nfs_subs.c#9 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#16 integrate .. //depot/projects/uart/nfsclient/nfsmount.h#5 integrate .. //depot/projects/uart/nfsclient/nfsnode.h#8 integrate .. //depot/projects/uart/opencrypto/criov.c#3 integrate .. //depot/projects/uart/opencrypto/crypto.c#7 integrate .. //depot/projects/uart/opencrypto/cryptodev.c#9 integrate .. //depot/projects/uart/opencrypto/cryptodev.h#5 integrate .. //depot/projects/uart/opencrypto/cryptosoft.c#7 integrate .. //depot/projects/uart/opencrypto/cryptosoft.h#3 integrate .. //depot/projects/uart/opencrypto/xform.c#5 integrate .. //depot/projects/uart/opencrypto/xform.h#3 integrate .. //depot/projects/uart/pc98/cbus/fdc.c#5 integrate .. //depot/projects/uart/pc98/cbus/olpt.c#2 integrate .. //depot/projects/uart/pc98/conf/GENERIC#14 integrate .. //depot/projects/uart/pc98/conf/GENERIC.hints#6 integrate .. //depot/projects/uart/pc98/conf/NOTES#17 integrate .. //depot/projects/uart/pc98/include/pcvt_ioctl.h#2 delete .. //depot/projects/uart/pc98/pc98/canbus.c#4 integrate .. //depot/projects/uart/pci/agp_i810.c#9 integrate .. //depot/projects/uart/pci/amdpm.c#10 integrate .. //depot/projects/uart/pci/amdsmb.c#2 integrate .. //depot/projects/uart/pci/if_pcn.c#11 integrate .. //depot/projects/uart/pci/nfsmb.c#2 integrate .. //depot/projects/uart/pci/viapm.c#7 integrate .. //depot/projects/uart/posix4/ksched.c#5 integrate .. //depot/projects/uart/posix4/p1003_1b.c#5 integrate .. //depot/projects/uart/powerpc/powerpc/clock.c#8 integrate .. //depot/projects/uart/powerpc/powerpc/machdep.c#13 integrate .. //depot/projects/uart/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/uart/powerpc/powerpc/vm_machdep.c#11 integrate .. //depot/projects/uart/sparc64/sparc64/prof_machdep.c#2 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#13 integrate .. //depot/projects/uart/sys/file.h#7 integrate .. //depot/projects/uart/sys/param.h#26 integrate .. //depot/projects/uart/sys/proc.h#23 integrate .. //depot/projects/uart/sys/user.h#9 integrate .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#16 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#20 integrate .. //depot/projects/uart/ufs/ufs/dinode.h#4 integrate .. //depot/projects/uart/vm/uma_core.c#22 integrate .. //depot/projects/uart/vm/vm_fault.c#15 integrate Differences ... ==== //depot/projects/uart/amd64/amd64/mp_machdep.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.275 2006/05/01 22:06:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.276 2006/05/16 14:32:16 phk Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -56,7 +56,6 @@ #include #include -#include #include #include #include ==== //depot/projects/uart/amd64/conf/GENERIC#20 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.456 2006/05/09 22:27:00 ambrisko Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.458 2006/05/17 20:45:44 marius Exp $ cpu HAMMER ident GENERIC @@ -188,6 +188,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card device ixgb # Intel PRO/10GbE Ethernet Card +device le # AMD Am7900 LANCE and Am79C9xx PCnet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') @@ -202,7 +203,7 @@ device lge # Level 1 LXT1001 gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking -device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc') +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') @@ -224,8 +225,6 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards -# XXX kvtop brokenness, pointer/int warnings -#device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet ==== //depot/projects/uart/amd64/conf/NOTES#9 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.54 2006/05/09 22:27:00 ambrisko Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.55 2006/05/14 18:49:24 marius Exp $ # # @@ -221,16 +221,12 @@ # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) -# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and -# Am79C960) # nve: nVidia nForce MCP on-board Ethernet Networking device ed options ED_3C503 options ED_HPP options ED_SIC -#XXX# still calls MD i386 kvtop function instead of vtophys etc -#XXX#device lnc device nve # nVidia nForce MCP on-board Ethernet Networking device ath ==== //depot/projects/uart/amd64/include/clock.h#7 (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.51 2005/12/22 22:16:05 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.52 2006/05/19 18:53:50 sobomax Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -25,6 +25,7 @@ extern uint64_t tsc_freq; extern int tsc_is_broken; extern int wall_cmos_clock; +extern struct mtx clock_lock; /* * Driver to clock driver interface. ==== //depot/projects/uart/amd64/include/mutex.h#3 (text+ko) ==== @@ -26,19 +26,10 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.38 2003/12/06 23:17:18 peter Exp $ + * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.39 2006/05/19 18:53:50 sobomax Exp $ */ #ifndef _MACHINE_MUTEX_H_ #define _MACHINE_MUTEX_H_ -#ifndef LOCORE -#ifdef _KERNEL - -/* Global locks */ -extern struct mtx clock_lock; - -#endif /* _KERNEL */ - -#endif /* !LOCORE */ #endif /* __MACHINE_MUTEX_H */ ==== //depot/projects/uart/arm/arm/machdep.c#10 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.22 2006/05/10 13:39:10 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.23 2006/05/15 10:40:37 benno Exp $"); #include #include @@ -233,7 +233,36 @@ #endif cpu_setup(""); + identify_arm_cpu(); + + printf("real memory = %ju (%ju MB)\n", (uintmax_t)ptoa(physmem), + (uintmax_t)ptoa(physmem) / 1048576); + realmem = physmem; + + /* + * Display the RAM layout. + */ + if (bootverbose) { + int indx; + + printf("Physical memory chunk(s):\n"); + for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) { + vm_paddr_t size; + + size = phys_avail[indx + 1] - phys_avail[indx]; + printf("%#08jx - %#08jx, %ju bytes (%ju pages)\n", + (uintmax_t)phys_avail[indx], + (uintmax_t)phys_avail[indx + 1] - 1, + (uintmax_t)size, (uintmax_t)size / PAGE_SIZE); + } + } + vm_ksubmap_init(&kmi); + + printf("avail memory = %ju (%ju MB)\n", + (uintmax_t)ptoa(cnt.v_free_count), + (uintmax_t)ptoa(cnt.v_free_count) / 1048576); + bufinit(); vm_pager_bufferinit(); pcb->un_32.pcb32_und_sp = (u_int)thread0.td_kstack + @@ -242,7 +271,6 @@ USPACE_SVC_STACK_TOP; vector_page_setprot(VM_PROT_READ); pmap_set_pcb_pagedir(pmap_kernel(), pcb); - identify_arm_cpu(); thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1; pmap_postinit(); #ifdef ARM_CACHE_LOCK_ENABLE @@ -252,8 +280,6 @@ m = vm_page_alloc(NULL, 0, VM_ALLOC_NOOBJ | VM_ALLOC_ZERO); pmap_kenter_user(ARM_TP_ADDRESS, VM_PAGE_TO_PHYS(m)); #endif - realmem = physmem; - } SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) ==== //depot/projects/uart/arm/at91/at91.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.5 2006/04/20 04:12:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.7 2006/05/19 11:27:02 cognet Exp $"); #include #include @@ -122,7 +122,7 @@ NULL, /* read region */ - NULL, + generic_bs_rr_1, generic_armv4_bs_rr_2, generic_bs_rr_4, NULL, @@ -314,6 +314,7 @@ AT91RM92_BASE + AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, AT91RM92_IRQ_EMAC }, +#ifndef SKYEYE_WORKAROUNDS { "uart", 0, AT91RM92_BASE + AT91RM92_DBGU_BASE, AT91RM92_DBGU_SIZE, @@ -339,6 +340,13 @@ AT91RM92_BASE + AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART3 }, +#else + { + "uart", 0, + AT91RM92_BASE + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, + AT91RM92_IRQ_USART0 + }, +#endif { "at91_ssc", 0, AT91RM92_BASE + AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, ==== //depot/projects/uart/arm/at91/at91_st.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.2 2006/03/18 01:30:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.3 2006/05/13 23:41:15 cognet Exp $"); #include #include @@ -72,7 +72,11 @@ static struct timecounter at91st_timecounter = { at91st_get_timecount, /* get_timecount */ NULL, /* no poll_pps */ +#ifdef SKYEYE_WORKAROUNDS + 0xffffffffu, /* counter_mask */ +#else 0xfffffu, /* counter_mask */ +#endif 32768, /* frequency */ "AT91RM9200 timer", /* name */ 0 /* quality */ @@ -122,10 +126,18 @@ DRIVER_MODULE(at91_st, atmelarm, at91st_driver, at91st_devclass, 0, 0); +#ifdef SKYEYE_WORKAROUNDS +static unsigned long tot_count = 0; +#endif + static unsigned at91st_get_timecount(struct timecounter *tc) { +#ifdef SKYEYE_WORKAROUNDS + return (tot_count); +#else return (st_crtr()); +#endif } static void @@ -134,8 +146,12 @@ struct trapframe *fp = arg; /* The interrupt is shared, so we have to make sure it's for us. */ - if (RD4(ST_SR) & ST_SR_PITS) + if (RD4(ST_SR) & ST_SR_PITS) { +#ifdef SKYEYE_WORKAROUNDS + tot_count += 32768 / hz; +#endif hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); + } } void ==== //depot/projects/uart/arm/at91/if_ate.c#4 (text) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.6 2006/04/06 04:30:23 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.7 2006/05/13 23:41:15 cognet Exp $"); #include #include @@ -71,7 +71,7 @@ #include "miibus_if.h" -#define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ +#define ATE_MAX_TX_BUFFERS 64 /* We have ping-pong tx buffers */ #define ATE_MAX_RX_BUFFERS 64 struct ate_softc ==== //depot/projects/uart/arm/at91/uart_bus_at91usart.c#3 (text) ==== @@ -25,7 +25,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.2 2006/05/11 14:30:28 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.3 2006/05/13 23:41:16 cognet Exp $"); #include #include @@ -76,22 +76,20 @@ switch (device_get_unit(dev)) { case 0: +#ifdef SKYEYE_WORKAROUNDS + device_set_desc(dev, "USART0"); +#else device_set_desc(dev, "DBGU"); -#ifndef USART0_CONSOLE +#endif /* * Setting sc_sysdev makes this device a 'system device' and * indirectly makes it the system console. */ sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); -#endif break; case 1: device_set_desc(dev, "USART0"); -#ifdef USART0_CONSOLE - sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); - bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); -#endif break; case 2: device_set_desc(dev, "USART1"); @@ -104,7 +102,7 @@ break; } sc->sc_class = &at91_usart_class; - return (uart_bus_probe(dev, 0, 0, 0, 0)); + return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev))); } ==== //depot/projects/uart/arm/at91/uart_cpu_at91rm9200usart.c#2 (text) ==== @@ -27,7 +27,7 @@ #include "opt_uart.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_cpu_at91rm9200usart.c,v 1.2 2006/05/13 23:41:16 cognet Exp $"); #include #include @@ -62,13 +62,11 @@ * XXX: Not pretty, but will work because we map VA == PA early * for the last 1MB of memory. */ -#ifdef USART0_CONSOLE +#ifdef SKYEYE_WORKAROUNDS di->bas.bsh = AT91RM92_BASE + AT91RM92_USART0_BASE; - di->bas.chan = 1; di->baudrate = 38400; #else di->bas.bsh = AT91RM92_BASE + AT91RM92_SYS_BASE + DBGU; - di->bas.chan = 0; di->baudrate = 115200; #endif di->bas.regshft = 0; @@ -76,12 +74,10 @@ di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; + uart_bus_space_io = &at91_bs_tag; + uart_bus_space_mem = NULL; /* Check the environment for overrides */ if (uart_getenv(devtype, di) == 0) return (0); - - uart_bus_space_io = &at91_bs_tag; - uart_bus_space_mem = NULL; - return (0); } ==== //depot/projects/uart/arm/at91/uart_dev_at91usart.c#5 (text) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 2005 M. Warner Losh - * Copyright (c) 2005 cognet + * Copyright (c) 2005 Olivier Houchard * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.5 2006/04/06 20:47:54 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.6 2006/05/13 23:41:16 cognet Exp $"); #include #include @@ -322,6 +322,7 @@ return (err); } +#ifndef SKYEYE_WORKAROUNDS static void at91_getaddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) { @@ -329,22 +330,28 @@ return; *(bus_addr_t *)arg = segs[0].ds_addr; } +#endif static int at91_usart_bus_transmit(struct uart_softc *sc) { +#ifndef SKYEYE_WORKAROUNDS bus_addr_t addr; +#endif struct at91_usart_softc *atsc; atsc = (struct at91_usart_softc *)sc; +#ifndef SKYEYE_WORKAROUNDS if (bus_dmamap_load(atsc->dmatag, atsc->tx_map, sc->sc_txbuf, sc->sc_txdatasz, at91_getaddr, &addr, 0) != 0) return (EAGAIN); bus_dmamap_sync(atsc->dmatag, atsc->tx_map, BUS_DMASYNC_PREWRITE); +#endif uart_lock(sc->sc_hwmtx); sc->sc_txbusy = 1; +#ifndef SKYEYE_WORKAROUNDS /* * Setup the PDC to transfer the data and interrupt us when it * is done. We've already requested the interrupt. @@ -353,7 +360,9 @@ WR4(&sc->sc_bas, PDC_TCR, sc->sc_txdatasz); WR4(&sc->sc_bas, PDC_PTCR, PDC_PTCR_TXTEN); uart_unlock(sc->sc_hwmtx); -#ifdef USART0_CONSOLE +#else + for (int i = 0; i < sc->sc_txdatasz; i++) + at91_usart_putc(&sc->sc_bas, sc->sc_txbuf[i]); /* * XXX: Gross hack : Skyeye doesn't raise an interrupt once the * transfer is done, so simulate it. @@ -416,16 +425,7 @@ int ipend = 0; struct at91_usart_softc *atsc; - atsc = (struct at91_usart_softc *)sc; -#ifdef USART0_CONSOLE - /* - * XXX: We have to cheat for skyeye, as it will return 0xff for all - * the devices it doesn't emulate. - */ - if (sc->sc_bas.chan != 1) - return (0); -#endif - + atsc = (struct at91_usart_softc *)sc; if (csr & USART_CSR_ENDTX) { bus_dmamap_sync(atsc->dmatag, atsc->tx_map, BUS_DMASYNC_POSTWRITE); ==== //depot/projects/uart/arm/conf/KB920X#2 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.3 2006/02/07 18:45:10 imp Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.4 2006/05/19 00:11:21 cognet Exp $ machine arm ident KB920X @@ -60,7 +60,7 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options SYSCTL_OMIT_DESCR +#options SYSCTL_OMIT_DESCR options MUTEX_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING ==== //depot/projects/uart/arm/conf/SIMICS#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.8 2005/10/04 14:39:33 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.9 2006/05/13 02:47:39 imp Exp $ machine arm ident SIMICS @@ -49,13 +49,11 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI #options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev device genclock device loop device ether @@ -65,10 +63,6 @@ #device saarm device rl device uart -#options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -#options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking @@ -76,11 +70,5 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -# To make an SMP kernel, the next two are needed -#options SMP # Symmetric MultiProcessor Kernel -#options APIC_IO # Symmetric (APIC) I/O - device mem # Memory and kernel memory devices device md -# Floppy drives - ==== //depot/projects/uart/arm/conf/SKYEYE#2 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.2 2006/02/07 18:45:54 imp Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.3 2006/05/13 23:41:15 cognet Exp $ machine arm ident KB920X @@ -33,7 +33,6 @@ options DDB options KDB -options USART0_CONSOLE options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -43,6 +42,7 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device +options MD_ROOT_SIZE=4096 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server @@ -83,6 +83,7 @@ device mem # Memory and kernel memory devices device md +options SKYEYE_WORKAROUNDS options ARM32_NEW_VM_LAYOUT # Floppy drives ==== //depot/projects/uart/arm/include/_types.h#5 (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/arm/include/_types.h,v 1.8 2006/01/09 06:05:56 imp Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.9 2006/05/15 00:17:27 cognet Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -87,7 +87,7 @@ typedef __int32_t __segsz_t; /* segment size (in pages) */ typedef __uint32_t __size_t; /* sizeof() */ typedef __int32_t __ssize_t; /* byte count or error */ -typedef __int32_t __time_t; /* time()... */ +typedef __int64_t __time_t; /* time()... */ typedef __uint32_t __uintfptr_t; typedef __uint64_t __uintmax_t; typedef __uint32_t __uintptr_t; ==== //depot/projects/uart/arm/include/atomic.h#9 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.18 2006/04/13 14:25:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.19 2006/05/15 13:08:12 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -324,10 +324,12 @@ #define atomic_clear_acq_long atomic_clear_32 #define atomic_subtract_int atomic_subtract_32 #define atomic_subtract_rel_int atomic_subtract_32 +#define atomic_subtract_rel_32 atomic_subtract_32 #define atomic_subtract_acq_int atomic_subtract_32 #define atomic_add_int atomic_add_32 #define atomic_add_acq_long atomic_add_32 #define atomic_add_rel_int atomic_add_32 +#define atomic_add_rel_32 atomic_add_32 #define atomic_add_acq_int atomic_add_32 #define atomic_cmpset_int atomic_cmpset_32 #define atomic_cmpset_rel_int atomic_cmpset_32 @@ -340,6 +342,7 @@ #define atomic_cmpset_rel_32 atomic_cmpset_32 #define atomic_cmpset_rel_ptr atomic_cmpset_ptr #define atomic_load_acq_int atomic_load_32 +#define atomic_load_acq_32 atomic_load_32 #define atomic_clear_ptr atomic_clear_32 #define atomic_store_ptr atomic_store_32 #define atomic_cmpset_ptr atomic_cmpset_32 ==== //depot/projects/uart/arm/include/pmap.h#10 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.16 2006/04/09 20:03:03 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.17 2006/05/13 23:41:15 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -332,12 +332,17 @@ #endif /* ARM_NMMUS > 1 */ +#ifdef SKYEYE_WORKAROUNDS +#define PMAP_NEEDS_PTE_SYNC 1 +#define PMAP_INCLUDE_PTE_SYNC +#else #if (ARM_MMU_SA1 == 1) && (ARM_NMMUS == 1) #define PMAP_NEEDS_PTE_SYNC 1 #define PMAP_INCLUDE_PTE_SYNC #elif (ARM_MMU_SA1 == 0) #define PMAP_NEEDS_PTE_SYNC 0 #endif +#endif /* * These macros return various bits based on kernel/user and protection. ==== //depot/projects/uart/arm/sa11x0/assabet_machdep.c#6 (text+ko) ==== @@ -47,7 +47,7 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.10 2005/10/03 14:15:50 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.11 2006/05/22 23:25:34 cognet Exp $"); #include "opt_md.h" @@ -93,6 +93,8 @@ #include >>> TRUNCATED FOR MAIL (1000 lines) <<<