Date: Sat, 19 May 2007 15:32:09 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 120058 for review Message-ID: <200705191532.l4JFW9LB010994@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=120058 Change 120058 by jhb@jhb_mutex on 2007/05/19 15:31:43 IFC @120057 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#66 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#43 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#75 integrate .. //depot/projects/smpng/sys/amd64/include/md_var.h#15 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#15 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#21 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#21 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#39 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#78 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#29 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.h#12 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#60 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#82 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#60 integrate .. //depot/projects/smpng/sys/conf/kern.mk#19 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#56 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#65 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#21 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#25 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#14 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#127 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#119 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#23 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.S#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#110 integrate .. //depot/projects/smpng/sys/ia64/ia64/mca.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#84 integrate .. //depot/projects/smpng/sys/kern/init_main.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#148 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#101 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#31 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#84 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#38 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#104 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#142 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#79 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#31 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#8 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#15 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#15 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#12 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#18 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#108 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#51 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#96 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#54 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#39 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#49 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#51 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#74 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#86 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#70 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#11 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte_hash.c#7 integrate .. //depot/projects/smpng/sys/sys/lockf.h#7 integrate .. //depot/projects/smpng/sys/sys/param.h#118 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#44 integrate .. //depot/projects/smpng/sys/sys/vmmeter.h#7 integrate .. //depot/projects/smpng/sys/sys/vnode.h#80 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#53 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#71 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#71 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#43 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#67 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#61 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#86 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#94 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#92 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#35 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#62 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#66 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -221,8 +221,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#43 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -80,6 +80,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#75 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.584 2007/04/25 18:10:43 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,8 +1149,7 @@ */ m->right = *free; *free = m; - - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); return 1; } @@ -1460,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/smpng/sys/amd64/include/md_var.h#15 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,8 +57,6 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; -extern struct pcpu __pcpu[]; - typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; struct reg; ==== //depot/projects/smpng/sys/amd64/include/smp.h#15 (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.89 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ * */ @@ -23,6 +23,7 @@ #include <machine/frame.h> #include <machine/intr_machdep.h> #include <machine/apicvar.h> +#include <machine/pcb.h> /* global symbols in mpboot.S */ extern char mptramp_start[]; ==== //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#21 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); /* * ARM bus dma support routines @@ -1003,7 +1003,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + vm_offset_t lastaddr = 0; #ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -1079,7 +1079,7 @@ return; } -static __inline void +static void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; ==== //depot/projects/smpng/sys/arm/arm/machdep.c#21 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.25 2007/02/14 04:41:28 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -286,8 +286,8 @@ 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); + (uintmax_t)ptoa(VMCNT_GET(free_count)), + (uintmax_t)ptoa(VMCNT_GET(free_count)) / 1048576); bufinit(); vm_pager_bufferinit(); @@ -547,7 +547,7 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tf = td->td_frame; - __greg_t *gr = mcp->__gregs; + const __greg_t *gr = mcp->__gregs; tf->tf_r0 = gr[_REG_R0]; tf->tf_r1 = gr[_REG_R1]; ==== //depot/projects/smpng/sys/arm/arm/pmap.c#39 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -431,10 +431,10 @@ l1->l1_kva = l1pt; l1->l1_domain_use_count = 0; - l1->l1_domain_first = 0; + l1->l1_domain_first = 1; for (i = 0; i < PMAP_DOMAINS; i++) - l1->l1_domain_free[i] = i + 1; + l1->l1_domain_free[i] = i + 2; /* * Copy the kernel's L1 entries to each new L1. @@ -1970,7 +1970,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2910,7 +2910,7 @@ /* * remove a page rom the kernel pagetables */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { struct l2_bucket *l2b; ==== //depot/projects/smpng/sys/arm/include/pmap.h#22 (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.24 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,8 +237,8 @@ /* * Definitions for MMU domains */ -#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */ -#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */ +#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */ +#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ /* * The new pmap ensures that page-tables are always mapping Write-Thru. ==== //depot/projects/smpng/sys/boot/i386/boot2/Makefile#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $ FILES= boot boot1 boot2 @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#78 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); #include <sys/param.h> @@ -1303,9 +1303,8 @@ struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; - rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_SCSIDA, - M_NOWAIT); + rcap = (struct scsi_read_capacity_data *) + malloc(sizeof(*rcap), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcap == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ @@ -1330,7 +1329,7 @@ struct scsi_read_capacity_data_long *rcaplong; rcaplong = (struct scsi_read_capacity_data_long *) - malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT); + malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcaplong == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ ==== //depot/projects/smpng/sys/coda/coda_vnops.c#29 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.70 2007/03/13 01:50:21 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.71 2007/05/18 13:02:12 kib Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -129,7 +129,7 @@ .vop_readlink = coda_readlink, /* readlink */ .vop_inactive = coda_inactive, /* inactive */ .vop_reclaim = coda_reclaim, /* reclaim */ - ._vop_lock = coda_lock, /* lock */ + .vop_lock1 = coda_lock, /* lock */ .vop_unlock = coda_unlock, /* unlock */ .vop_bmap = coda_bmap, /* bmap */ .vop_print = VOP_PANIC, /* print */ @@ -1627,7 +1627,7 @@ } int -coda_lock(struct _vop_lock_args *ap) +coda_lock(struct vop_lock1_args *ap) { /* true args */ struct vnode *vp = ap->a_vp; ==== //depot/projects/smpng/sys/coda/coda_vnops.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.17 2006/11/13 05:51:21 kmacy Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.18 2007/05/18 13:02:12 kib Exp $ * */ @@ -72,7 +72,7 @@ vop_bmap_t coda_bmap; vop_strategy_t coda_strategy; vop_reclaim_t coda_reclaim; -_vop_lock_t coda_lock; +vop_lock1_t coda_lock; vop_unlock_t coda_unlock; vop_islocked_t coda_islocked; int coda_vop_error(void *); ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#60 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.112 2007/05/01 03:09:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.113 2007/05/18 07:10:43 jeff Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -146,14 +146,14 @@ /* * The correct thing here would be: * - memfree = cnt.v_free_count * PAGE_SIZE; + memfree = VMCNT_GET(free_count) * PAGE_SIZE; memused = memtotal - memfree; * * but it might mislead linux binaries into thinking there * is very little memory left, so we cheat and tell them that * all memory that isn't wired down is free. */ - memused = cnt.v_wire_count * PAGE_SIZE; + memused = VMCNT_GET(wire_count) * PAGE_SIZE; memfree = memtotal - memused; swap_pager_status(&i, &j); swaptotal = (unsigned long long)i * PAGE_SIZE; @@ -175,7 +175,7 @@ * like unstaticizing it just for linprocfs's sake. */ buffers = 0; - cached = cnt.v_cache_count * PAGE_SIZE; + cached = VMCNT_GET(cache_count) * PAGE_SIZE; sbuf_printf(sb, " total: used: free: shared: buffers: cached:\n" @@ -394,12 +394,12 @@ "intr %u\n" "ctxt %u\n" "btime %lld\n", - cnt.v_vnodepgsin, - cnt.v_vnodepgsout, - cnt.v_swappgsin, - cnt.v_swappgsout, - cnt.v_intr, - cnt.v_swtch, + VMCNT_GET(vnodepgsin), + VMCNT_GET(vnodepgsout), + VMCNT_GET(swappgsin), + VMCNT_GET(swappgsout), + VMCNT_GET(intr), + VMCNT_GET(swtch), (long long)boottime.tv_sec); return (0); } ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#82 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.208 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.209 2007/05/18 07:10:43 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -139,7 +139,7 @@ LINUX_SYSINFO_LOADS_SCALE / averunnable.fscale; sysinfo.totalram = physmem * PAGE_SIZE; - sysinfo.freeram = sysinfo.totalram - cnt.v_wire_count * PAGE_SIZE; + sysinfo.freeram = sysinfo.totalram - VMCNT_GET(wire_count) * PAGE_SIZE; sysinfo.sharedram = 0; mtx_lock(&vm_object_list_mtx); ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#60 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.91 2006/11/06 13:41:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.92 2007/05/18 07:10:44 jeff Exp $"); #include "opt_mac.h" @@ -778,14 +778,14 @@ #if defined(UVM) *retval = uvmexp.free; /* XXX: free instead of total */ #else - *retval = cnt.v_free_count; /* XXX: free instead of total */ + *retval = VMCNT_GET(free_count); /* XXX: free instead of total */ #endif break; case SVR4_CONFIG_AVPHYS_PAGES: #if defined(UVM) *retval = uvmexp.active; /* XXX: active instead of avg */ #else - *retval = cnt.v_active_count; /* XXX: active instead of avg */ + *retval = VMCNT_GET(active_count); /* XXX: active instead of avg */ #endif break; #endif /* NOTYET */ ==== //depot/projects/smpng/sys/conf/kern.mk#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif @@ -46,7 +46,7 @@ # a very small subset of float registers for integer divides. # .if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata INLINE_LIMIT?= 15000 .endif ==== //depot/projects/smpng/sys/conf/kern.pre.mk#56 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -90,7 +90,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/smpng/sys/conf/kmod.mk#65 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.217 2007/03/21 03:42:49 sam Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ # # The include file <bsd.kmod.mk> handles building and installing loadable # kernel modules. @@ -79,7 +79,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -93,7 +93,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif ==== //depot/projects/smpng/sys/dev/sound/isa/mss.c#32 (text+ko) ==== @@ -29,7 +29,7 @@ #include <dev/sound/pcm/sound.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.110 2007/05/19 10:53:01 joel Exp $"); /* board-specific include files */ #include <dev/sound/isa/mss.h> @@ -1320,7 +1320,7 @@ goto mss_probe_end; } tmp &= 0x3f; - if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00)) { + if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00 || tmp == 0x05)) { BVDDB(printf("No MSS signature detected on port 0x%lx (0x%x)\n", rman_get_start(mss->io_base), tmpx)); goto no; ==== //depot/projects/smpng/sys/dev/sound/pci/envy24.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -859,7 +859,7 @@ spicds_setcif(ptr->info, ptr->parent->cfg->cif); spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); /* for the time being, init only first codec */ if (ptr->num == 0) spicds_init(ptr->info); ==== //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -932,7 +932,7 @@ ptr->parent->cfg->type == SPICDS_TYPE_AK4528) { spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); } /* for the time being, init only first codec */ ==== //depot/projects/smpng/sys/dev/sound/pci/fm801.c#21 (text+ko) ==== @@ -29,11 +29,11 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.31 2007/05/19 13:19:32 joel Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 -#define PCI_DEVICE_FORTEMEDIA1 0x08011319 -#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */ +#define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ +#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ #define FM_PCM_VOLUME 0x00 #define FM_FM_VOLUME 0x02 @@ -417,15 +417,16 @@ struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - if(ch->dir == PCMDIR_PLAY) { - if(fm801->play_flip) return fm801->play_blksize; + /* + * Don't mind for play_flip, set the blocksize to the + * desired values in any case - otherwise sound playback + * breaks here. + */ + if(ch->dir == PCMDIR_PLAY) fm801->play_blksize = blocksize; - } - if(ch->dir == PCMDIR_REC) { - if(fm801->rec_flip) return fm801->rec_blksize; + if(ch->dir == PCMDIR_REC) fm801->rec_blksize = blocksize; - } DPRINT("fm801ch_setblocksize %d (dir %d)\n",blocksize, ch->dir); ==== //depot/projects/smpng/sys/dev/twa/tw_osl.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.4 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -52,7 +52,7 @@ #define TW_OSLI_MAX_NUM_IOS TW_CL_MAX_SIMULTANEOUS_REQUESTS #define TW_OSLI_MAX_NUM_AENS 0x100 -#define TW_OSLI_DEFERRED_INTR_USED +//#define TW_OSLI_DEFERRED_INTR_USED /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ ==== //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.7 2007/05/10 15:36:58 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.8 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -75,7 +75,7 @@ #define TW_OSL_ENCLOSURE_SUPPORT #endif -#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.006" +#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.007" #define TW_OSL_CAN_SLEEP ==== //depot/projects/smpng/sys/dev/usb/ufoma.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.2 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.3 2007/05/19 04:57:15 kan Exp $"); /*- * Copyright (c) 2005, Takanori Watanabe * Copyright (c) 2003, M. Warner Losh <imp@freebsd.org>. @@ -256,8 +256,6 @@ }; -static devclass_t ucom_devclass; - DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0); MODULE_DEPEND(ufoma, usb, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#30 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.93 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.94 2007/05/18 13:02:12 kib Exp $ */ /* @@ -510,7 +510,7 @@ * vnodes below us on the stack. */ static int -null_lock(struct _vop_lock_args *ap) +null_lock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; @@ -728,7 +728,7 @@ .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_islocked = null_islocked, - ._vop_lock = null_lock, + .vop_lock1 = null_lock, .vop_lookup = null_lookup, .vop_open = null_open, .vop_print = null_print, ==== //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#25 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.37 2006/08/09 17:43:26 alc Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.38 2007/05/18 07:10:44 jeff Exp $ * */ #include <sys/param.h> @@ -475,8 +475,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodein++; - cnt.v_vnodepgsin += npages; + VMCNT_ADD(vnodein, 1); + VMCNT_ADD(vnodepgsin, npages); iov.iov_base = (caddr_t) kva; iov.iov_len = count; @@ -626,8 +626,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodeout++; - cnt.v_vnodepgsout += count; + VMCNT_ADD(vnodeout, 1); + VMCNT_ADD(vnodepgsout, count); iov.iov_base = (caddr_t) kva; iov.iov_len = count; ==== //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 - * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.48 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.49 2007/05/18 13:02:12 kib Exp $ */ /* @@ -57,7 +57,7 @@ static vop_generic_t umap_bypass; static vop_getattr_t umap_getattr; static vop_inactive_t umap_inactive; -static vop_lock_t umap_lock; +static vop_lock1_t umap_lock; static vop_print_t umap_print; static vop_reclaim_t umap_reclaim; static vop_rename_t umap_rename; @@ -353,7 +353,7 @@ */ static int umap_lock(ap) - struct vop_lock_args /* { + struct vop_lock1_args /* { struct vnode *a_vp; int a_flags; struct thread *a_td; @@ -525,7 +525,7 @@ .vop_getattr = umap_getattr, .vop_inactive = umap_inactive, - .vop_lock = umap_lock, + .vop_lock1 = umap_lock, .vop_print = umap_print, .vop_reclaim = umap_reclaim, .vop_rename = umap_rename, ==== //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#35 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.140 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.141 2007/05/18 13:02:13 kib Exp $ * */ @@ -1630,7 +1630,7 @@ } static int -unionfs_lock(struct _vop_lock_args *ap) +unionfs_lock(struct vop_lock1_args *ap) { int error; int flags; @@ -2256,7 +2256,7 @@ .vop_lease = unionfs_lease, .vop_link = unionfs_link, .vop_listextattr = unionfs_listextattr, - ._vop_lock = unionfs_lock, + .vop_lock1 = unionfs_lock, .vop_lookup = unionfs_lookup, .vop_mkdir = unionfs_mkdir, .vop_mknod = unionfs_mknod, ==== //depot/projects/smpng/sys/i386/i386/machdep.c#127 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.650 2007/03/17 19:42:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.651 2007/05/18 07:10:44 jeff Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -247,8 +247,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/smpng/sys/i386/i386/pmap.c#119 (text+ko) ==== @@ -75,7 +75,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705191532.l4JFW9LB010994>