From owner-p4-projects@FreeBSD.ORG Mon Sep 24 13:30:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A38C316A468; Mon, 24 Sep 2007 13:30:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 640A216A420 for ; Mon, 24 Sep 2007 13:30:29 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A6DA13C474 for ; Mon, 24 Sep 2007 13:30:29 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8ODUTP5059152 for ; Mon, 24 Sep 2007 13:30:29 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8ODUKwr059146 for perforce@freebsd.org; Mon, 24 Sep 2007 13:30:20 GMT (envelope-from delphij@freebsd.org) Date: Mon, 24 Sep 2007 13:30:20 GMT Message-Id: <200709241330.l8ODUKwr059146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 126770 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: Mon, 24 Sep 2007 13:30:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=126770 Change 126770 by delphij@tarsier on 2007/09/24 13:30:08 IFC Affected files ... .. //depot/projects/delphij_fork/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/uma_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/amd64/include/smp.h#2 integrate .. //depot/projects/delphij_fork/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/delphij_fork/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/delphij_fork/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/conf/CRB#2 integrate .. //depot/projects/delphij_fork/sys/arm/include/asmacros.h#2 integrate .. //depot/projects/delphij_fork/sys/arm/include/endian.h#2 integrate .. //depot/projects/delphij_fork/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/delphij_fork/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/delphij_fork/sys/conf/NOTES#10 integrate .. //depot/projects/delphij_fork/sys/conf/files#8 integrate .. //depot/projects/delphij_fork/sys/conf/options#7 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_ps.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/an/if_an.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/awi/awi.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_sge_defs.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/delphij_fork/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/delphij_fork/sys/dev/em/if_em.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/em/if_em.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/if_zyd.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/wi/if_wi.c#4 integrate .. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_fat.c#7 integrate .. //depot/projects/delphij_fork/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/delphij_fork/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/delphij_fork/sys/geom/virstor/binstream.c#1 branch .. //depot/projects/delphij_fork/sys/geom/virstor/binstream.h#1 branch .. //depot/projects/delphij_fork/sys/geom/virstor/g_virstor.c#1 branch .. //depot/projects/delphij_fork/sys/geom/virstor/g_virstor.h#1 branch .. //depot/projects/delphij_fork/sys/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/delphij_fork/sys/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/delphij_fork/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/i386/geode.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/include/smp.h#2 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux.h#2 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/delphij_fork/sys/ia64/ia64/uma_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/init_main.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_clock.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_fork.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_kse.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_proc.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_switch.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_synch.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/kern_thread.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/sched_ule.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/subr_lock.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/subr_smp.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/subr_trap.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/subr_witness.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/sys_process.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/delphij_fork/sys/modules/cxgb/Makefile#3 integrate .. //depot/projects/delphij_fork/sys/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/sound/driver/emu10kx/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/net/bpf.c#4 integrate .. //depot/projects/delphij_fork/sys/net/bpf_filter.c#2 integrate .. //depot/projects/delphij_fork/sys/net/if_bridge.c#4 integrate .. //depot/projects/delphij_fork/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/delphij_fork/sys/net/if_media.h#2 integrate .. //depot/projects/delphij_fork/sys/net/if_stf.c#2 integrate .. //depot/projects/delphij_fork/sys/net/rtsock.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_power.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_regdomain.c#3 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in_gif.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp.h#6 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_peeloff.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/delphij_fork/sys/netinet/sctputil.c#9 integrate .. //depot/projects/delphij_fork/sys/netinet/sctputil.h#5 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/delphij_fork/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_var.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/delphij_fork/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/delphij_fork/sys/pci/agp_i810.c#3 integrate .. //depot/projects/delphij_fork/sys/pci/agp_via.c#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/powerpc/uma_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/delphij_fork/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/delphij_fork/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/delphij_fork/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/delphij_fork/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/delphij_fork/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/delphij_fork/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/delphij_fork/sys/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/delphij_fork/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/delphij_fork/sys/sparc64/sbus/sbusreg.h#3 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/sun4v/mdesc/mdesc_init.c#2 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/delphij_fork/sys/sys/callout.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/lock_profile.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/mount.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/proc.h#5 integrate .. //depot/projects/delphij_fork/sys/sys/socket.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/user.h#2 integrate .. //depot/projects/delphij_fork/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_glue.c#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/delphij_fork/sys/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.163 2007/06/06 07:35:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -74,7 +74,6 @@ ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); -ASSYM(P_SFLAG, offsetof(struct proc, p_sflag)); ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); @@ -181,6 +180,7 @@ ASSYM(ENOENT, ENOENT); ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(MAXCPU, MAXCPU); ASSYM(MAXCOMLEN, MAXCOMLEN); ASSYM(MAXPATHLEN, MAXPATHLEN); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); ==== //depot/projects/delphij_fork/sys/amd64/amd64/local_apic.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.41 2007/08/02 21:17:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $"); #include "opt_hwpmc_hooks.h" @@ -1061,7 +1061,7 @@ printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) /* * Setup the I/O APICs. ==== //depot/projects/delphij_fork/sys/amd64/amd64/uma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.3 2007/02/18 06:33:01 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/uma_machdep.c,v 1.4 2007/09/15 18:47:01 alc Exp $"); #include #include @@ -50,9 +50,9 @@ *flags = UMA_SLAB_PRIV; if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else - pflags = VM_ALLOC_SYSTEM; + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; for (;;) { @@ -82,5 +82,7 @@ pa = DMAP_TO_PHYS((vm_offset_t)mem); dump_drop_page(pa); m = PHYS_TO_VM_PAGE(pa); + m->wire_count--; vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, 1); } ==== //depot/projects/delphij_fork/sys/amd64/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.91 2007/09/20 20:38:43 attilio Exp $ * */ @@ -34,7 +34,6 @@ extern int mp_naps; extern int boot_cpu_id; extern struct pcb stoppcbs[]; -extern struct mtx smp_tlb_mtx; extern int cpu_apic_ids[]; /* IPI handlers */ ==== //depot/projects/delphij_fork/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.233 2007/07/23 09:42:30 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.234 2007/09/14 01:12:39 attilio Exp $"); /* * Routines to handle clock hardware. @@ -565,7 +565,7 @@ i8254_init(void) { - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_NOPROFILE); set_timer_freq(timer_freq, hz); } ==== //depot/projects/delphij_fork/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.15 2007/03/29 02:11:46 julian Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.16 2007/09/18 19:50:32 dwmalone Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -242,6 +242,19 @@ l_ulonglong st_ino; } __packed; +struct l_statfs64 { + l_int f_type; + l_int f_bsize; + uint64_t f_blocks; + uint64_t f_bfree; + uint64_t f_bavail; + uint64_t f_files; + uint64_t f_ffree; + l_fsid_t f_fsid; + l_int f_namelen; + l_int f_spare[6]; +} __packed; + struct l_new_utsname { char sysname[LINUX_MAX_UTSNAME]; char nodename[LINUX_MAX_UTSNAME]; ==== //depot/projects/delphij_fork/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.32 2007/08/28 12:36:23 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ @@ -801,6 +801,7 @@ }; struct linux_statfs64_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)]; char buf_l_[PADL_(struct l_statfs64_buf *)]; struct l_statfs64_buf * buf; char buf_r_[PADR_(struct l_statfs64_buf *)]; }; struct linux_fstatfs64_args { ==== //depot/projects/delphij_fork/sys/amd64/linux32/linux32_syscall.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.32 2007/08/28 12:36:23 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.33 2007/09/18 19:50:32 dwmalone Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ ==== //depot/projects/delphij_fork/sys/amd64/linux32/linux32_sysent.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.32 2007/08/28 12:36:23 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.33 2007/09/18 19:50:32 dwmalone Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp */ ==== //depot/projects/delphij_fork/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.30 2007/07/12 18:01:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.31 2007/09/20 13:46:26 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -372,6 +372,7 @@ frame.sf_sc.uc_mcontext.sc_esp_at_signal = regs->tf_rsp; frame.sf_sc.uc_mcontext.sc_ss = regs->tf_ss; frame.sf_sc.uc_mcontext.sc_err = regs->tf_err; + frame.sf_sc.uc_mcontext.sc_cr2 = (u_int32_t)(uintptr_t)ksi->ksi_addr; frame.sf_sc.uc_mcontext.sc_trapno = bsd_to_linux_trapcode(code); #ifdef DEBUG @@ -503,6 +504,7 @@ frame.sf_sc.sc_esp_at_signal = regs->tf_rsp; frame.sf_sc.sc_ss = regs->tf_ss; frame.sf_sc.sc_err = regs->tf_err; + frame.sf_sc.sc_cr2 = (u_int32_t)(uintptr_t)ksi->ksi_addr; frame.sf_sc.sc_trapno = bsd_to_linux_trapcode(code); for (i = 0; i < (LINUX_NSIG_WORDS-1); i++) ==== //depot/projects/delphij_fork/sys/amd64/linux32/syscalls.master#3 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.29 2007/08/28 12:26:34 kib Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.30 2007/09/18 19:50:32 dwmalone Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -436,7 +436,7 @@ 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } 267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ struct l_timespec *rqtp, struct l_timespec *rmtp); } -268 AUE_STATFS STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } +268 AUE_STATFS STD { int linux_statfs64(char *path, size_t bufsize, struct l_statfs64_buf *buf); } 269 AUE_FSTATFS STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } 271 AUE_UTIMES STD { int linux_utimes(char *fname, \ ==== //depot/projects/delphij_fork/sys/arm/arm/pmap.c#3 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.84 2007/07/27 14:45:04 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.86 2007/09/22 22:47:48 cognet Exp $"); #include #include #include @@ -270,7 +270,6 @@ */ union pmap_cache_state *pmap_cache_state; -/* static pt_entry_t *msgbufmap;*/ struct msgbuf *msgbufp = 0; extern void bcopy_page(vm_offset_t, vm_offset_t); @@ -4074,7 +4073,7 @@ panic("pmap_zero_page: page has mappings"); #endif - if (_arm_bzero && + if (_arm_bzero && size >= _min_bzero_size && _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0) return; @@ -4115,7 +4114,7 @@ void pmap_zero_page_xscale(vm_paddr_t phys, int off, int size) { - if (_arm_bzero && + if (_arm_bzero && size >= _min_bzero_size && _arm_bzero((void *)(phys + off), size, IS_PHYSICAL) == 0) return; mtx_lock(&cmtx); @@ -4429,7 +4428,7 @@ #endif cpu_dcache_wbinv_all(); - if (_arm_memcpy && + if (_arm_memcpy && PAGE_SIZE >= _min_memcpy_size && _arm_memcpy((void *)VM_PAGE_TO_PHYS(dst), (void *)VM_PAGE_TO_PHYS(src), PAGE_SIZE, IS_PHYSICAL) == 0) return; ==== //depot/projects/delphij_fork/sys/arm/arm/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.33 2007/07/27 14:46:15 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.34 2007/09/15 18:47:01 alc Exp $"); #include #include @@ -580,9 +580,9 @@ return (ret); } if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; + pflags = VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED; else - pflags = VM_ALLOC_SYSTEM; + pflags = VM_ALLOC_SYSTEM | VM_ALLOC_WIRED; if (wait & M_ZERO) pflags |= VM_ALLOC_ZERO; for (;;) { @@ -640,9 +640,9 @@ vm_paddr_t pa = vtophys((vm_offset_t)mem); m = PHYS_TO_VM_PAGE(pa); - vm_page_lock_queues(); + m->wire_count--; vm_page_free(m); - vm_page_unlock_queues(); + atomic_subtract_int(&cnt.v_wire_count, 1); } } } ==== //depot/projects/delphij_fork/sys/arm/at91/at91_mci.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.4 2007/09/16 07:48:58 imp Exp $"); #include #include @@ -293,13 +293,10 @@ else clkdiv = (at91_master_clock / ios->clock) / 2; } - if (ios->bus_width == bus_width_4 && sc->wire4) { - device_printf(sc->dev, "Setting controller bus width to 4\n"); + if (ios->bus_width == bus_width_4 && sc->wire4) WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) | MCI_SDCR_SDCBUS); - } else { - device_printf(sc->dev, "Setting controller bus width to 1\n"); + else WR4(sc, MCI_SDCR, RD4(sc, MCI_SDCR) & ~MCI_SDCR_SDCBUS); - } WR4(sc, MCI_MR, (RD4(sc, MCI_MR) & ~MCI_MR_CLKDIV) | clkdiv); #if 0 if (sc->vcc_pin) { ==== //depot/projects/delphij_fork/sys/arm/at91/at91_pmc.c#2 (text) ==== @@ -25,7 +25,7 @@ #include "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.4 2007/01/05 01:14:14 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.5 2007/09/16 07:51:02 imp Exp $"); #include #include @@ -162,7 +162,6 @@ struct at91_pmc_softc *sc = pmc_softc; uint32_t value; - printf("Turning PLLB %#x %s\n", sc->pllb_init, on ? "on" : "off"); if (on) { on = PMC_IER_LOCKB; value = sc->pllb_init; @@ -172,7 +171,6 @@ WR4(sc, CKGR_PLLBR, value); while ((RD4(sc, PMC_SR) & PMC_IER_LOCKB) != on) continue; - printf("Done!\n"); } static void @@ -180,7 +178,6 @@ { struct at91_pmc_softc *sc = pmc_softc; - printf("Turning SC %#x %s\n", clk->pmc_mask, on ? "on" : "off"); WR4(sc, on ? PMC_SCER : PMC_SCDR, clk->pmc_mask); if (on) while ((RD4(sc, PMC_SCSR) & clk->pmc_mask) != clk->pmc_mask) @@ -188,7 +185,6 @@ else while ((RD4(sc, PMC_SCSR) & clk->pmc_mask) == clk->pmc_mask) continue; - printf("Done SCSR is now: %#x!\n", RD4(sc, PMC_SCSR)); } static void @@ -196,7 +192,6 @@ { struct at91_pmc_softc *sc = pmc_softc; - printf("Turning PC %#x %s\n", clk->pmc_mask, on ? "on" : "off"); WR4(sc, on ? PMC_PCER : PMC_PCDR, clk->pmc_mask); if (on) while ((RD4(sc, PMC_PCSR) & clk->pmc_mask) != clk->pmc_mask) @@ -204,7 +199,6 @@ else while ((RD4(sc, PMC_PCSR) & clk->pmc_mask) == clk->pmc_mask) continue; - printf("Done PCSR is now: %#x!\n", RD4(sc, PMC_PCSR)); } struct at91_pmc_clock * @@ -228,7 +222,6 @@ at91_pmc_clock_enable(struct at91_pmc_clock *clk) { /* XXX LOCKING? XXX */ - printf("Enable %s\n", clk->name); if (clk->parent) at91_pmc_clock_enable(clk->parent); if (clk->refcnt++ == 0 && clk->set_mode) ==== //depot/projects/delphij_fork/sys/arm/conf/CRB#2 (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/CRB,v 1.1 2007/07/27 14:57:03 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.2 2007/09/22 16:25:42 cognet Exp $ machine arm ident CRB @@ -84,6 +84,8 @@ device atapist # ATAPI tape drives options ATA_STATIC_ID # Static device numbering +device "7seg" + # SCSI Controllers device pty ==== //depot/projects/delphij_fork/sys/arm/include/asmacros.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.5 2006/04/13 14:25:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asmacros.h,v 1.6 2007/09/22 14:23:52 cognet Exp $ */ #ifndef _MACHINE_ASMACROS_H_ @@ -116,18 +116,15 @@ ldr r5, =0xe0000004; /* Check if there's any RAS */ \ ldr r3, [r5]; \ cmp r3, #0; /* Is the update needed ? */ \ - beq 1f; \ - ldr lr, [r0, #16]; \ - ldr r1, =0xe0000008; \ - ldr r4, [r1]; /* Get the end of the RAS */ \ - mov r2, #0; /* Reset the magic addresses */ \ - str r2, [r5]; \ - str r2, [r1]; \ - cmp lr, r3; /* Were we in the RAS ? */ \ - blt 1f; \ - cmp lr, r4; \ - strlt r3, [r0, #16]; /* Yes, update the pc */ \ - 1: \ + ldrgt lr, [r0, #16]; \ + ldrgt r1, =0xe0000008; \ + ldrgt r4, [r1]; /* Get the end of the RAS */ \ + movgt r2, #0; /* Reset the magic addresses */ \ + strgt r2, [r5]; \ + strgt r2, [r1]; \ + cmpgt lr, r3; /* Were we in the RAS ? */ \ + cmpgt r4, lr; \ + strgt r3, [r0, #16]; /* Yes, update the pc */ \ mrs r0, spsr_all; /* Put the SPSR on the stack */ \ str r0, [sp, #-4]! ==== //depot/projects/delphij_fork/sys/arm/include/endian.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.11 2007/09/09 11:58:38 cognet Exp $ */ #ifndef _ENDIAN_H_ @@ -99,13 +99,15 @@ static __inline __uint16_t __bswap16_var(__uint16_t v) { + __uint32_t ret = v & 0xffff; + __asm __volatile( "mov %0, %0, ror #8\n" "orr %0, %0, %0, lsr #16\n" "bic %0, %0, %0, lsl #16" - : "+r" (v)); + : "+r" (ret)); - return (v); + return ((__uint16_t)ret); } #ifdef __OPTIMIZE__ ==== //depot/projects/delphij_fork/sys/arm/sa11x0/uart_dev_sa1110.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.8 2007/04/02 22:00:21 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.9 2007/09/12 18:28:09 cognet Exp $"); #include #include @@ -97,7 +97,7 @@ static void sa1110_putc(struct uart_bas *bas, int c) { - while (!uart_getreg(bas, SACOM_SR1) & SR1_TNF); + while (!(uart_getreg(bas, SACOM_SR1) & SR1_TNF)); uart_setreg(bas, SACOM_DR, c); } @@ -186,7 +186,7 @@ uart_setreg(&sc->sc_bas, SACOM_CR3, uart_getreg(&sc->sc_bas, SACOM_CR3) | CR3_TIE); for (i = 0; i < sc->sc_txdatasz; i++) { - while (!uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF); + while (!(uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF)); uart_setreg(&sc->sc_bas, SACOM_DR, sc->sc_txbuf[i]); uart_barrier(&sc->sc_bas); ==== //depot/projects/delphij_fork/sys/arm/xscale/i8134x/crb_machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.1 2007/07/27 14:50:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.2 2007/09/22 16:25:43 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -171,6 +171,13 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + { + IOP34X_PCE1_VADDR, + IOP34X_PCE1, + IOP34X_PCE1_SIZE, + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, { 0, 0, ==== //depot/projects/delphij_fork/sys/arm/xscale/i8134x/files.crb#2 (text+ko) ==== @@ -1,2 +1,3 @@ -# $FreeBSD: src/sys/arm/xscale/i8134x/files.crb,v 1.1 2007/07/27 14:50:57 cognet Exp $ +# $FreeBSD: src/sys/arm/xscale/i8134x/files.crb,v 1.2 2007/09/22 16:25:43 cognet Exp $ arm/xscale/i8134x/crb_machdep.c standard +arm/xscale/i8134x/iq81342_7seg.c optional 7seg ==== //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.1 2007/07/27 14:50:57 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.2 2007/09/22 16:25:43 cognet Exp $"); #include #include @@ -400,6 +400,7 @@ device_add_child(dev, "iopwdog", 0); device_add_child(dev, "pcib", 0); device_add_child(dev, "pcib", 1); + device_add_child(dev, "iqseg", 0); bus_generic_probe(dev); bus_generic_attach(dev); return (0); ==== //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342reg.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/xscale/i8134x/i81342reg.h,v 1.1 2007/07/27 14:50:57 cognet Exp $ */ +/* $FreeBSD: src/sys/arm/xscale/i8134x/i81342reg.h,v 1.3 2007/09/22 22:25:24 cognet Exp $ */ #ifndef I83142_REG_H_ #define I83142_REG_H_ @@ -46,9 +46,51 @@ #define IOP34X_HWADDR 0xffd00000 #define IOP34X_SIZE 0x100000 +#define IOP34X_ADMA0_OFFSET 0x00080000 +#define IOP34X_ADMA1_OFFSET 0x00080200 +#define IOP34X_ADMA2_OFFSET 0x00080400 +#define IOP34X_ADMA_SIZE 0x200 + + +/* ADMA Registers */ +#define IOP34X_ADMA_CCR 0x0000 /* Channel Control Register */ +#define IOP34X_ADMA_CSR 0x0004 /* Channel Status Register */ +#define IOP34X_ADMA_DAR 0x0008 /* Descriptor Address Register */ +#define IOP34X_ADMA_IPCR 0x0018 /* Internal Interface Parity Ctrl Reg */ +#define IOP34X_ADMA_NDAR 0x0024 /* Next Descriptor Register */ +#define IOP34X_ADMA_DCR 0x0028 /* Descriptor Control Register */ + +#define IOP34X_ADMA_IE (1 << 0) /* Interrupt enable */ +#define IOP34X_ADMA_TR (1 << 1) /* Transfert Direction */ +/* + * Source Destination + * 00 Host I/O Interface Local Memory + * 01 Local Memory Host I/O Interface + * 10 Internal Bus Local Memory + * 11 Local Memory Internal Bus + */ +#define IOP34X_ADMA_SS (1 << 3) /* Source selection */ +/* 0000: Data Transfer / CRC / Memory Block Fill */ +#define IOP34X_ADMA_ZRBCE (1 << 7) /* Zero Result Buffer Check Enable */ +#define IOP34X_ADMA_MBFE (1 << 8) /* Memory Block Fill Enable */ +#define IOP34X_ADMA_CGE (1 << 9) /* CRC Generation enable */ +#define IOP34X_ADMA_CTD (1 << 10) /* CRC Transfer disable */ +#define IOP34X_ADMA_CSFD (1 << 11) /* CRC Seed fetch disable */ +#define IOP34X_ADMA_SWBE (1 << 12) /* Status write back enable */ +#define IOP34X_ADMA_ESE (1 << 13) /* Endian swap enable */ +#define IOP34X_ADMA_PQUTE (1 << 16) /* P+Q Update Transfer Enable */ +#define IOP34X_ADMA_DXE (1 << 17) /* Dual XOR Enable */ +#define IOP34X_ADMA_PQTE (1 << 18) /* P+Q Transfer Enable */ +#define IOP34X_ADMA_PTD (1 << 19) /* P Transfer Disable */ +#define IOP34X_ADMA_ROE (1 << 30) /* Relaxed Ordering Enable */ +#define IOP34X_ADMA_NSE (1 << 31) /* No Snoop Enable */ + #define IOP34X_PBBAR0 0x81588 /* PBI Base Address Register 0 */ #define IOP34X_PBBAR0_ADDRMASK 0xfffff000 #define IOP34X_PBBAR1 0x81590 +#define IOP34X_PCE1 0xF2000000 +#define IOP34X_PCE1_SIZE 0x00100000 +#define IOP34X_PCE1_VADDR 0xF1000000 #define IOP34X_ESSTSR0 0x82188 #define IOP34X_CONTROLLER_ONLY (1 << 14) #define IOP34X_INT_SEL_PCIX (1 << 15) ==== //depot/projects/delphij_fork/sys/compat/linux/linux_stats.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.87 2007/03/06 07:39:12 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.88 2007/09/18 19:50:33 dwmalone Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -306,19 +306,6 @@ l_int f_spare[6]; }; -struct l_statfs64 { - l_int f_type; - l_int f_bsize; - uint64_t f_blocks; - uint64_t f_bfree; - uint64_t f_bavail; - uint64_t f_files; - uint64_t f_ffree; - l_fsid_t f_fsid; - l_int f_namelen; - l_int f_spare[6]; -}; - #define LINUX_CODA_SUPER_MAGIC 0x73757245L #define LINUX_EXT2_SUPER_MAGIC 0xEF53L #define LINUX_HPFS_SUPER_MAGIC 0xf995e849L @@ -418,6 +405,9 @@ char *path; int error; + if (args->bufsize != sizeof(struct l_statfs64)) + return EINVAL; + LCONVPATHEXIST(td, args->path, &path); #ifdef DEBUG ==== //depot/projects/delphij_fork/sys/conf/NOTES#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1449 2007/08/13 17:19:27 emax Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1453 2007/09/23 07:34:22 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -154,6 +154,7 @@ options GEOM_STRIPE # Disk striping. options GEOM_SUNLABEL # Sun/Solaris partitioning options GEOM_UZIP # Read-only compressed disks +options GEOM_VIRSTOR # Virtual storage. options GEOM_VOL # Volume names from UFS superblock options GEOM_ZERO # Performance testing helper. @@ -739,9 +740,6 @@ # The `pflog' device provides the pflog0 interface which logs packets. # The `pfsync' device provides the pfsync0 interface used for # synchronization of firewall state tables (over the net). -# The PF_MPSAFE_UGID option enables a special workaround for a LOR with -# user/group rules that would otherwise lead to a deadlock. This has -# performance implications and should be used with care. # # The PPP_BSDCOMP option enables support for compress(1) style entire # packet compression, the PPP_DEFLATE is for zlib/gzip style compression. @@ -776,7 +774,6 @@ device pf #PF OpenBSD packet-filter firewall device pflog #logging support interface for PF device pfsync #synchronization interface for PF -options PF_MPSAFE_UGID #Workaround LOR with user/group rules device carp #Common Address Redundancy Protocol device enc #IPsec interface device ppp #Point-to-point protocol @@ -1316,8 +1313,8 @@ # HARDWARE DEVICE CONFIGURATION # For ISA the required hints are listed. -# EISA, MCA, PCI and pccard are self identifying buses, so no hints -# are needed. +# EISA, MCA, PCI, CardBus, SD/MMC and pccard are self identifying buses, so +# no hints are needed. # # Mandatory devices: @@ -2043,7 +2040,6 @@ device snd_ds1 device snd_emu10k1 device snd_emu10kx -options SND_EMU10KX_MULTICHANNEL device snd_envy24 device snd_envy24ht device snd_es137x @@ -2227,7 +2223,7 @@ # # PC Card/PCMCIA and Cardbus # -# pccbb: pci/cardbus bridge implementing YENTA interface +# cbb: pci/cardbus bridge implementing YENTA interface # pccard: pccard slots >>> TRUNCATED FOR MAIL (1000 lines) <<<