PERFORCE change 120112 for review
Rui Paulo
rpaulo at FreeBSD.org
Sun May 20 14:08:04 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=120112
Change 120112 by rpaulo at rpaulo_epsilon on 2007/05/20 14:07:43
IFC
Affected files ...
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/include/md_var.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/include/smp.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/pmap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/include/asm.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/include/pmap.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/include/profile.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/coda/coda_vnops.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/linprocfs/linprocfs.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/kern.mk#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/kern.pre.mk#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/kmod.mk#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/isa/mss.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/fm801.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/twa/tw_osl_share.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ufoma.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/smbfs/smbfs_io.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/include/smp.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/exception.S#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/mca.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/init_main.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_fork.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_lock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_malloc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mib.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mutex.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_rwlock.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sx.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_synch.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_thread.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_lock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_trap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_turnstile.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_bio.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_default.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vnode_if.src#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_fwsubr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_fec.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_mppc.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/icmp6.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_output.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/icmp6.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/in6_proto.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/smp.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/ver.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/identcpu.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/mem.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/cache.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/iommureg.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/iommuvar.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/ofw_upa.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/pmap.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/upa.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/ver.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/bus_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/hviommu.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/nexus.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tick.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tsb.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/tte_hash.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/lockf.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/sx.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/sysctl.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/vmmeter.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/vnode.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/swap_pager.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/uma_core.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_contig.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_fault.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_glue.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_map.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_meter.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_mmap.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_object.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageq.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vnode_pager.c#2 integrate
Differences ...
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#2 (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/soc2007/rpaulo-macbook/amd64/amd64/mp_machdep.c#3 (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/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#3 (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/soc2007/rpaulo-macbook/amd64/include/md_var.h#2 (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/soc2007/rpaulo-macbook/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.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/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#2 (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/soc2007/rpaulo-macbook/arm/arm/machdep.c#2 (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/soc2007/rpaulo-macbook/arm/arm/pmap.c#2 (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/soc2007/rpaulo-macbook/arm/include/asm.h#2 (text+ko) ====
@@ -33,7 +33,7 @@
*
* from: @(#)asm.h 5.5 (Berkeley) 5/7/91
*
- * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $
*/
#ifndef _MACHINE_ASM_H_
@@ -80,7 +80,7 @@
#ifdef GPROF
# define _PROF_PROLOGUE \
- mov ip, lr; bl _mcount
+ mov ip, lr; bl __mcount
#else
# define _PROF_PROLOGUE
#endif
==== //depot/projects/soc2007/rpaulo-macbook/arm/include/pmap.h#2 (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/soc2007/rpaulo-macbook/arm/include/profile.h#2 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $
+ * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $
*/
#ifndef _MACHINE_PROFILE_H_
@@ -61,9 +61,9 @@
#define MCOUNT \
__asm__(".text"); \
__asm__(".align 0"); \
- __asm__(".type _mcount ,%function"); \
- __asm__(".global _mcount"); \
- __asm__("_mcount:"); \
+ __asm__(".type __mcount ,%function"); \
+ __asm__(".global __mcount"); \
+ __asm__("__mcount:"); \
/* \
* Preserve registers that are trashed during mcount \
*/ \
==== //depot/projects/soc2007/rpaulo-macbook/boot/i386/boot2/Makefile#2 (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/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#4 (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/soc2007/rpaulo-macbook/coda/coda_vnops.c#2 (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/soc2007/rpaulo-macbook/coda/coda_vnops.h#2 (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/soc2007/rpaulo-macbook/compat/linprocfs/linprocfs.c#4 (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/soc2007/rpaulo-macbook/compat/linux/linux_misc.c#2 (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/soc2007/rpaulo-macbook/compat/svr4/svr4_misc.c#2 (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/soc2007/rpaulo-macbook/conf/kern.mk#2 (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/soc2007/rpaulo-macbook/conf/kern.pre.mk#3 (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/soc2007/rpaulo-macbook/conf/kmod.mk#2 (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/soc2007/rpaulo-macbook/dev/sound/isa/mss.c#2 (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/soc2007/rpaulo-macbook/dev/sound/pci/envy24.c#3 (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/soc2007/rpaulo-macbook/dev/sound/pci/envy24ht.c#3 (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/soc2007/rpaulo-macbook/dev/sound/pci/fm801.c#2 (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/soc2007/rpaulo-macbook/dev/twa/tw_osl.h#3 (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/soc2007/rpaulo-macbook/dev/twa/tw_osl_share.h#3 (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/soc2007/rpaulo-macbook/dev/usb/ufoma.c#2 (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 at 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/soc2007/rpaulo-macbook/fs/nullfs/null_vnops.c#2 (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/soc2007/rpaulo-macbook/fs/smbfs/smbfs_io.c#2 (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/soc2007/rpaulo-macbook/fs/umapfs/umap_vnops.c#2 (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;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list