Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Aug 2003 09:36:15 -0700 (PDT)
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 35631 for review
Message-ID:  <200308061636.h76GaFpQ058312@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=35631

Change 35631 by sam@sam_ebb on 2003/08/06 09:35:16

	IFC

Affected files ...

.. //depot/projects/netperf/sys/alpha/alpha/critical.c#2 integrate
.. //depot/projects/netperf/sys/alpha/alpha/machdep.c#4 integrate
.. //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#3 integrate
.. //depot/projects/netperf/sys/alpha/alpha/pmap.c#3 integrate
.. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#3 integrate
.. //depot/projects/netperf/sys/alpha/include/critical.h#2 integrate
.. //depot/projects/netperf/sys/alpha/include/endian.h#2 integrate
.. //depot/projects/netperf/sys/alpha/include/param.h#2 integrate
.. //depot/projects/netperf/sys/amd64/amd64/amd64_mem.c#1 branch
.. //depot/projects/netperf/sys/amd64/amd64/busdma_machdep.c#3 integrate
.. //depot/projects/netperf/sys/amd64/amd64/critical.c#3 integrate
.. //depot/projects/netperf/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/netperf/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/netperf/sys/amd64/include/critical.h#2 integrate
.. //depot/projects/netperf/sys/amd64/include/ieeefp.h#2 integrate
.. //depot/projects/netperf/sys/amd64/include/param.h#2 integrate
.. //depot/projects/netperf/sys/arm/include/endian.h#2 integrate
.. //depot/projects/netperf/sys/boot/efi/libefi/efiboot.h#2 integrate
.. //depot/projects/netperf/sys/boot/efi/libefi/efifs.c#2 integrate
.. //depot/projects/netperf/sys/boot/efi/loader/main.c#2 integrate
.. //depot/projects/netperf/sys/boot/powerpc/loader/start.c#2 integrate
.. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/netperf/sys/conf/NOTES#3 integrate
.. //depot/projects/netperf/sys/conf/files.alpha#2 integrate
.. //depot/projects/netperf/sys/conf/files.amd64#2 integrate
.. //depot/projects/netperf/sys/conf/files.i386#2 integrate
.. //depot/projects/netperf/sys/conf/files.ia64#2 integrate
.. //depot/projects/netperf/sys/conf/files.pc98#2 integrate
.. //depot/projects/netperf/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/netperf/sys/conf/options#3 integrate
.. //depot/projects/netperf/sys/contrib/dev/ath/README#2 integrate
.. //depot/projects/netperf/sys/contrib/dev/ath/ah.h#3 integrate
.. //depot/projects/netperf/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate
.. //depot/projects/netperf/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate
.. //depot/projects/netperf/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#3 integrate
.. //depot/projects/netperf/sys/contrib/dev/ath/version.h#3 integrate
.. //depot/projects/netperf/sys/contrib/dev/oltr/if_oltr.c#2 integrate
.. //depot/projects/netperf/sys/ddb/db_command.c#2 integrate
.. //depot/projects/netperf/sys/ddb/db_output.c#2 integrate
.. //depot/projects/netperf/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/netperf/sys/ddb/ddb.h#2 integrate
.. //depot/projects/netperf/sys/dev/ahb/ahb.c#2 integrate
.. //depot/projects/netperf/sys/dev/amd/amd.c#2 integrate
.. //depot/projects/netperf/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/netperf/sys/dev/digi/digi.h#2 integrate
.. //depot/projects/netperf/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/netperf/sys/dev/em/if_em.h#3 integrate
.. //depot/projects/netperf/sys/dev/em/if_em_osdep.h#2 integrate
.. //depot/projects/netperf/sys/dev/en/if_en_pci.c#2 integrate
.. //depot/projects/netperf/sys/dev/en/midway.c#2 integrate
.. //depot/projects/netperf/sys/dev/en/midwayvar.h#2 integrate
.. //depot/projects/netperf/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/netperf/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/firewire.h#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/firewirereg.h#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/fwdev.c#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/fwohci_pci.c#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#4 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatm_ioctl.c#3 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatm_rx.c#2 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatm_tx.c#3 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#3 integrate
.. //depot/projects/netperf/sys/dev/hfa/fore_aali.h#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/fore_command.c#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/fore_init.c#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/fore_intr.c#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/fore_output.c#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/fore_var.h#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/fore_vcm.c#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/hfa_freebsd.c#2 integrate
.. //depot/projects/netperf/sys/dev/hfa/hfa_freebsd.h#2 integrate
.. //depot/projects/netperf/sys/dev/md/md.c#3 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patm_ioctl.c#3 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patm_rx.c#3 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patm_tx.c#3 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patmvar.h#2 integrate
.. //depot/projects/netperf/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/netperf/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/netperf/sys/dev/pdq/if_fea.c#2 integrate
.. //depot/projects/netperf/sys/dev/ppc/ppc.c#2 integrate
.. //depot/projects/netperf/sys/dev/ppc/ppc_puc.c#1 branch
.. //depot/projects/netperf/sys/dev/ppc/ppcvar.h#1 branch
.. //depot/projects/netperf/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/netperf/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/netperf/sys/dev/sound/pcm/feeder.c#2 integrate
.. //depot/projects/netperf/sys/dev/sound/pcm/feeder.h#2 integrate
.. //depot/projects/netperf/sys/dev/sym/sym_fw.h#2 integrate
.. //depot/projects/netperf/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/netperf/sys/dev/twe/twe_compat.h#2 integrate
.. //depot/projects/netperf/sys/dev/twe/twe_freebsd.c#2 integrate
.. //depot/projects/netperf/sys/dev/twe/twe_tables.h#2 integrate
.. //depot/projects/netperf/sys/dev/twe/tweio.h#2 integrate
.. //depot/projects/netperf/sys/dev/twe/twereg.h#2 integrate
.. //depot/projects/netperf/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/netperf/sys/fs/specfs/spec_vnops.c#2 integrate
.. //depot/projects/netperf/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/netperf/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/netperf/sys/i386/i386/critical.c#2 integrate
.. //depot/projects/netperf/sys/i386/i386/exception.s#2 integrate
.. //depot/projects/netperf/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/netperf/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/netperf/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/netperf/sys/i386/i386/sys_machdep.c#2 integrate
.. //depot/projects/netperf/sys/i386/i386/tsc.c#2 integrate
.. //depot/projects/netperf/sys/i386/include/clock.h#2 integrate
.. //depot/projects/netperf/sys/i386/include/critical.h#2 integrate
.. //depot/projects/netperf/sys/i386/include/endian.h#2 integrate
.. //depot/projects/netperf/sys/i386/include/sysarch.h#2 integrate
.. //depot/projects/netperf/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/cxreg.h#2 integrate
.. //depot/projects/netperf/sys/i386/isa/if_rdp.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/spic.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/wt.c#2 integrate
.. //depot/projects/netperf/sys/i386/pci/pci_bus.c#2 edit
.. //depot/projects/netperf/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/critical.c#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/netperf/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/netperf/sys/ia64/ia64/timerreg.h#2 delete
.. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/netperf/sys/ia64/include/clock.h#2 integrate
.. //depot/projects/netperf/sys/ia64/include/cpu.h#3 integrate
.. //depot/projects/netperf/sys/ia64/include/critical.h#2 integrate
.. //depot/projects/netperf/sys/ia64/include/endian.h#2 integrate
.. //depot/projects/netperf/sys/ia64/include/param.h#2 integrate
.. //depot/projects/netperf/sys/ia64/include/pcpu.h#2 integrate
.. //depot/projects/netperf/sys/ia64/include/ucontext.h#2 integrate
.. //depot/projects/netperf/sys/isa/ppc.c#2 delete
.. //depot/projects/netperf/sys/isa/ppcreg.h#2 delete
.. //depot/projects/netperf/sys/kern/kern_acl.c#2 integrate
.. //depot/projects/netperf/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/netperf/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/netperf/sys/kern/kern_ktr.c#2 integrate
.. //depot/projects/netperf/sys/kern/kern_mac.c#2 integrate
.. //depot/projects/netperf/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/netperf/sys/kern/kern_physio.c#2 integrate
.. //depot/projects/netperf/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/netperf/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/netperf/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/netperf/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/netperf/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/netperf/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/netperf/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/netperf/sys/kern/sys_process.c#2 integrate
.. //depot/projects/netperf/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/netperf/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/netperf/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/netperf/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/netperf/sys/modules/en/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/ep/Makefile#2 integrate
.. //depot/projects/netperf/sys/net/bpf.c#2 integrate
.. //depot/projects/netperf/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/netperf/sys/net/if_atm.h#3 integrate
.. //depot/projects/netperf/sys/netinet/if_atm.c#3 integrate
.. //depot/projects/netperf/sys/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/netperf/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/netperf/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/netperf/sys/netinet6/nd6.h#2 integrate
.. //depot/projects/netperf/sys/netinet6/nd6_rtr.c#3 integrate
.. //depot/projects/netperf/sys/netnatm/natm.c#2 integrate
.. //depot/projects/netperf/sys/netnatm/natm.h#2 integrate
.. //depot/projects/netperf/sys/netnatm/natm_pcb.c#2 integrate
.. //depot/projects/netperf/sys/netnatm/natm_proto.c#2 integrate
.. //depot/projects/netperf/sys/pc98/i386/machdep.c#2 integrate
.. //depot/projects/netperf/sys/pc98/pc98/ppc.c#2 integrate
.. //depot/projects/netperf/sys/pc98/pc98/sio.c#2 integrate
.. //depot/projects/netperf/sys/pccard/pcic_pci.c#2 integrate
.. //depot/projects/netperf/sys/pci/if_ti.c#2 integrate
.. //depot/projects/netperf/sys/powerpc/include/critical.h#2 integrate
.. //depot/projects/netperf/sys/powerpc/include/endian.h#2 integrate
.. //depot/projects/netperf/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/netperf/sys/powerpc/powerpc/critical.c#2 integrate
.. //depot/projects/netperf/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/netperf/sys/powerpc/powerpc/pmap.c#3 integrate
.. //depot/projects/netperf/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/netperf/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/netperf/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/netperf/sys/sparc64/include/critical.h#2 integrate
.. //depot/projects/netperf/sys/sparc64/include/param.h#2 integrate
.. //depot/projects/netperf/sys/sparc64/sparc64/critical.c#2 integrate
.. //depot/projects/netperf/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/netperf/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/netperf/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/netperf/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/netperf/sys/sys/acl.h#2 integrate
.. //depot/projects/netperf/sys/sys/buf.h#2 integrate
.. //depot/projects/netperf/sys/sys/kse.h#2 integrate
.. //depot/projects/netperf/sys/sys/lock.h#2 integrate
.. //depot/projects/netperf/sys/sys/param.h#2 integrate
.. //depot/projects/netperf/sys/sys/proc.h#2 integrate
.. //depot/projects/netperf/sys/sys/socketvar.h#2 integrate
.. //depot/projects/netperf/sys/ufs/ufs/acl.h#2 integrate
.. //depot/projects/netperf/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/netperf/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/netperf/sys/vm/default_pager.c#2 integrate
.. //depot/projects/netperf/sys/vm/device_pager.c#2 integrate
.. //depot/projects/netperf/sys/vm/phys_pager.c#2 integrate
.. //depot/projects/netperf/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/netperf/sys/vm/swap_pager.h#2 integrate
.. //depot/projects/netperf/sys/vm/uma_core.c#4 integrate
.. //depot/projects/netperf/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/netperf/sys/vm/vm_kern.c#3 integrate
.. //depot/projects/netperf/sys/vm/vm_object.c#3 integrate
.. //depot/projects/netperf/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/netperf/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/netperf/sys/vm/vm_pager.c#2 integrate
.. //depot/projects/netperf/sys/vm/vm_pager.h#2 integrate
.. //depot/projects/netperf/sys/vm/vnode_pager.c#2 integrate

Differences ...

==== //depot/projects/netperf/sys/alpha/alpha/critical.c#2 (text+ko) ====

@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.4 2003/06/10 16:50:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.5 2003/08/04 20:32:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -31,17 +31,5 @@
 	struct thread *td;
 
 	td = curthread;
-	td->td_critnest = 1;
 	td->td_md.md_savecrit = ALPHA_PSL_IPL_0;
 }
-
-/*
- * cpu_thread_link() - thread linkup, initialize machine-dependant fields
- */
-void
-cpu_thread_link(struct thread *td)
-{
-
-	td->td_md.md_savecrit = 0;
-}
-

==== //depot/projects/netperf/sys/alpha/alpha/machdep.c#4 (text+ko) ====

@@ -88,10 +88,11 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.209 2003/07/30 06:38:35 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.211 2003/07/31 05:27:00 marcel Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
+#include "opt_kstack_pages.h"
 #include "opt_msgbuf.h"
 #include "opt_maxmem.h"
 
@@ -2073,6 +2074,9 @@
 		if (td == curthread) {
 			alpha_pal_wrusp(mcp->mc_regs[FRAME_SP]);
 			alpha_pal_wrunique(mcp->mc_thrptr);
+		} else {
+			td->td_pcb->pcb_hw.apcb_usp = mcp->mc_regs[FRAME_SP];
+			td->td_pcb->pcb_hw.apcb_unique = mcp->mc_thrptr;
 		}
 
 		/*

==== //depot/projects/netperf/sys/alpha/alpha/mp_machdep.c#3 (text+ko) ====

@@ -25,7 +25,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.45 2003/07/27 23:45:48 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.46 2003/07/31 01:31:31 peter Exp $");
+
+#include "opt_kstack_pages.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#3 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.131 2003/07/25 18:58:39 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.132 2003/07/31 03:39:50 bmilekic Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -642,7 +642,7 @@
 	if (initial_pvs < MINPV)
 		initial_pvs = MINPV;
 	pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL,
-	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM);
+	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
 	uma_prealloc(pvzone, initial_pvs);
 
 	/*

==== //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#3 (text+ko) ====

@@ -67,7 +67,9 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.89 2003/07/27 23:45:48 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.91 2003/07/31 01:31:31 peter Exp $");
+
+#include "opt_kstack_pages.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -260,7 +262,8 @@
 {
 
 	td->td_pcb =
-	     (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+	    (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
+	td->td_md.md_pcbpaddr = (void*)vtophys((vm_offset_t)td->td_pcb);
 	td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb) - 1;
 }
 

==== //depot/projects/netperf/sys/alpha/include/critical.h#2 (text+ko) ====

@@ -8,11 +8,10 @@
  *	cpu_critical_enter()		- inlined
  *	cpu_critical_exit()		- inlined
  *	cpu_critical_fork_exit()	- prototyped
- *	cpu_thread_link()		- prototyped
  *	related support functions residing
  *	in <arch>/<arch>/critical.c	- prototyped
  *
- * $FreeBSD: src/sys/alpha/include/critical.h,v 1.1 2002/04/01 23:51:22 dillon Exp $
+ * $FreeBSD: src/sys/alpha/include/critical.h,v 1.2 2003/08/04 20:32:44 jhb Exp $
  */
 
 #ifndef _MACHINE_CRITICAL_H_
@@ -24,7 +23,6 @@
  * Prototypes - see <arch>/<arch>/critical.c
  */
 void cpu_critical_fork_exit(void);
-void cpu_thread_link(struct thread *td);
 
 #ifdef	__GNUC__
 

==== //depot/projects/netperf/sys/alpha/include/endian.h#2 (text+ko) ====

@@ -32,7 +32,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  *	$NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $
- * $FreeBSD: src/sys/alpha/include/endian.h,v 1.13 2002/09/23 04:32:16 mike Exp $
+ * $FreeBSD: src/sys/alpha/include/endian.h,v 1.14 2003/08/03 07:50:18 obrien Exp $
  */
 
 #ifndef _MACHINE_ENDIAN_H_
@@ -44,8 +44,8 @@
 /*
  * Define the order of 32-bit words in 64-bit words.
  */
-#define _QUAD_HIGHWORD 1
-#define _QUAD_LOWWORD 0
+#define	_QUAD_HIGHWORD 1
+#define	_QUAD_LOWWORD 0
 
 /*
  * Definitions for byte order, according to byte significance from low
@@ -81,7 +81,7 @@
 }
 
 static __inline __uint32_t
-__bswap32(__uint32_t __x)
+__bswap32(__uint32_t _x)
 {
 	__uint32_t __r;
 
@@ -95,12 +95,12 @@
 		"or $4, $1, %0\n\t"
 		"or $2, $3, $2\n\t"
 		"or $2, %0, %0"
-		: "=r" (__r) : "r" (__x) : "$1", "$2", "$3", "$4");
+		: "=r" (__r) : "r" (_x) : "$1", "$2", "$3", "$4");
 	return (__r);
 }
 
-static __inline __uint16_t 
-__bswap16(__uint16_t __x)
+static __inline __uint16_t
+__bswap16(__uint16_t _x)
 {
 	__uint16_t __r;
 
@@ -108,7 +108,7 @@
 		"insbl %1, 1, $1\n\t"
 		"extbl %1, 1, $2\n\t"
 		"or $1, $2, %0"
-		: "=r" (__r) : "r" (__x) : "$1", "$2");
+		: "=r" (__r) : "r" (_x) : "$1", "$2");
 	return (__r);
 }
 

==== //depot/projects/netperf/sys/alpha/include/param.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/param.h,v 1.31 2003/06/14 23:23:52 alc Exp $ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.32 2003/07/31 01:31:31 peter Exp $ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*
@@ -117,7 +117,9 @@
 #define	SSIZE		1		/* initial stack size/NBPG */
 #define	SINCR		1		/* increment of stack/NBPG */
 
+#ifndef	KSTACK_PAGES
 #define	KSTACK_PAGES	2		/* pages of kstack (with pcb) */
+#endif
 #define	KSTACK_GUARD_PAGES	1	/* pages of kstack guard; 0 disables */
 #define	UAREA_PAGES	1		/* pages of u-area */
 

==== //depot/projects/netperf/sys/amd64/amd64/busdma_machdep.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.50 2003/07/27 13:52:08 mux Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.51 2003/08/04 23:40:35 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -476,7 +476,8 @@
 	else
 		pmap = NULL;
 
-	if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem)) {
+	if (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) &&
+	    map->pagesneeded == 0) {
 		vm_offset_t	vendaddr;
 
 		/*

==== //depot/projects/netperf/sys/amd64/amd64/critical.c#3 (text+ko) ====

@@ -4,7 +4,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.10 2003/07/25 21:15:44 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.11 2003/08/04 20:32:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -28,16 +28,5 @@
 	struct thread *td;
 
 	td = curthread;
-	td->td_critnest = 1;
 	td->td_md.md_savecrit = read_rflags() | PSL_I;
 }
-
-/*
- * cpu_thread_link() - thread linkup, initialize machine-dependant fields
- */
-void
-cpu_thread_link(struct thread *td)
-{
-
-	td->td_md.md_savecrit = 0;
-}

==== //depot/projects/netperf/sys/amd64/amd64/machdep.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.587 2003/07/25 21:15:44 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.588 2003/07/31 01:26:39 peter Exp $");
 
 #include "opt_atalk.h"
 #include "opt_compat.h"
@@ -47,10 +47,10 @@
 #include "opt_inet.h"
 #include "opt_ipx.h"
 #include "opt_isa.h"
+#include "opt_kstack_pages.h"
 #include "opt_maxmem.h"
 #include "opt_msgbuf.h"
 #include "opt_perfmon.h"
-#include "opt_kstack_pages.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#3 (text+ko) ====

@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.426 2003/07/25 21:15:44 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.428 2003/08/02 19:26:08 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -610,7 +610,7 @@
 	if (initial_pvs < MINPV)
 		initial_pvs = MINPV;
 	pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, 
-	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM);
+	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
 	uma_zone_set_allocf(pvzone, pmap_pv_allocf);
 	uma_prealloc(pvzone, initial_pvs);
 
@@ -2820,7 +2820,7 @@
 		return ((void *)PHYS_TO_DMAP(pa));
 	offset = pa & PAGE_MASK;
 	size = roundup(offset + size, PAGE_SIZE);
-	va = kmem_alloc_pageable(kernel_map, size);
+	va = kmem_alloc_nofault(kernel_map, size);
 	if (!va)
 		panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
 	pa = pa & PG_FRAME;

==== //depot/projects/netperf/sys/amd64/include/critical.h#2 (text+ko) ====

@@ -8,11 +8,10 @@
  *	cpu_critical_enter()		- inlined
  *	cpu_critical_exit()		- inlined
  *	cpu_critical_fork_exit()	- prototyped
- *	cpu_thread_link()		- prototyped
  *	related support functions residing
  *	in <arch>/<arch>/critical.c	- prototyped
  *
- * $FreeBSD: src/sys/amd64/include/critical.h,v 1.3 2003/05/01 01:05:23 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/critical.h,v 1.4 2003/08/04 20:32:45 jhb Exp $
  */
 
 #ifndef _MACHINE_CRITICAL_H_
@@ -24,7 +23,6 @@
  * Prototypes - see <arch>/<arch>/critical.c
  */
 void cpu_critical_fork_exit(void);
-void cpu_thread_link(struct thread *td);
 
 #ifdef	__GNUC__
 

==== //depot/projects/netperf/sys/amd64/include/ieeefp.h#2 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.9 2003/07/22 06:44:54 peter Exp $
+ * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.10 2003/08/02 00:26:30 peter Exp $
  */
 
 /*
@@ -266,8 +266,8 @@
 
 #if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) && defined(__GNUC__)
 
-#define	fpsetround()	__fpsetround()
-#define	fpgetround(_m)	__fpgetround(_m)
+#define	fpgetround()	__fpgetround()
+#define	fpsetround(_m)	__fpsetround(_m)
 #define	fpgetprec()	__fpgetprec()
 #define	fpsetprec(_m)	__fpsetprec(_m)
 #define	fpgetmask()	__fpgetmask()

==== //depot/projects/netperf/sys/amd64/include/param.h#2 (text+ko) ====

@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.7 2003/06/14 23:23:53 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.8 2003/07/31 01:27:18 peter Exp $
  */
 
 /*
@@ -117,7 +117,9 @@
 
 #define IOPAGES	2		/* pages of i/o permission bitmap */
 
+#ifndef	KSTACK_PAGES
 #define	KSTACK_PAGES	4	/* pages of kstack (with pcb) */
+#endif
 #define	KSTACK_GUARD_PAGES 1	/* pages of kstack guard; 0 disables */
 #define UAREA_PAGES	1	/* holds struct user WITHOUT PCB (see def.) */
 

==== //depot/projects/netperf/sys/arm/include/endian.h#2 (text+ko) ====

@@ -27,12 +27,12 @@
  *
  *	@(#)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.1 2001/01/04 05:23:06 obrien Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.2 2003/08/03 07:50:19 obrien Exp $
  */
 
 #ifndef _ENDIAN_H_
 #define	_ENDIAN_H_
 
-#define	BYTE_ORDER	LITTLE_ENDIAN
+#define	BYTE_ORDER	_LITTLE_ENDIAN
 
 #endif /* !_ENDIAN_H_ */

==== //depot/projects/netperf/sys/boot/efi/libefi/efiboot.h#2 (text+ko) ====

@@ -28,7 +28,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/boot/efi/libefi/efiboot.h,v 1.7 2002/10/24 07:53:12 marcel Exp $
+ * $FreeBSD: src/sys/boot/efi/libefi/efiboot.h,v 1.8 2003/08/02 08:22:03 marcel Exp $
  */
 
 /*
@@ -69,6 +69,9 @@
 /* Find EFI network resources */
 extern void efinet_init_driver(void);
 
+/* Map handles to units */
+int efifs_get_unit(EFI_HANDLE);
+
 /* Wrapper over EFI filesystems. */
 extern struct fs_ops efi_fsops;
 

==== //depot/projects/netperf/sys/boot/efi/libefi/efifs.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.7 2003/02/26 09:13:05 marcel Exp $
+ * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.8 2003/08/02 08:22:03 marcel Exp $
  */
 
 #include <sys/param.h>
@@ -291,7 +291,18 @@
 };
 
 static EFI_HANDLE *fs_handles;
-UINTN fs_handle_count;;
+UINTN fs_handle_count;
+
+int
+efifs_get_unit(EFI_HANDLE h)
+{
+	UINTN u;
+
+	u = 0;
+	while (u < fs_handle_count && fs_handles[u] != h)
+		u++;
+	return ((u < fs_handle_count) ? u : -1);
+}
 
 static int
 efifs_dev_init(void) 

==== //depot/projects/netperf/sys/boot/efi/loader/main.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.19 2003/04/03 21:36:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.20 2003/08/02 08:22:03 marcel Exp $");
 
 #include <stand.h>
 #include <string.h>
@@ -54,6 +54,7 @@
 
 EFI_GUID acpi = ACPI_TABLE_GUID;
 EFI_GUID acpi20 = ACPI_20_TABLE_GUID;
+EFI_GUID devid = DEVICE_PATH_PROTOCOL;
 EFI_GUID hcdp = HCDP_TABLE_GUID;
 EFI_GUID imgid = LOADED_IMAGE_PROTOCOL;
 EFI_GUID mps = MPS_TABLE_GUID;
@@ -101,8 +102,6 @@
 main(int argc, CHAR16 *argv[])
 {
 	EFI_LOADED_IMAGE *img;
-	EFI_SIMPLE_NETWORK *net;
-	EFI_STATUS status;
 	int i;
 
 	/* 
@@ -129,7 +128,6 @@
 
 	efinet_init_driver();
 
-
 	/* Get our loaded image protocol interface structure. */
 	BS->HandleProtocol(IH, &imgid, (VOID**)&img);
 
@@ -139,23 +137,16 @@
 	printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
 	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 
-	/*
-	 * XXX quick and dirty check to see if we're loaded from the
-	 * network. If so, we set the default device to 'net'. In all
-	 * other cases we set the default device to 'disk'. We presume
-	 * fixed positions in devsw for both net and disk.
-	 */
-	status = BS->HandleProtocol(img->DeviceHandle, &netid, (VOID**)&net);
-	if (status == EFI_SUCCESS && net != NULL) {
-		currdev.d_dev = devsw[1];	/* XXX net */
-		currdev.d_kind.netif.unit = 0;
-	} else {
-		currdev.d_dev = devsw[0];	/* XXX disk */
-		currdev.d_kind.efidisk.unit = 0;
+	i = efifs_get_unit(img->DeviceHandle);
+	if (i >= 0) {
+		currdev.d_dev = devsw[0];		/* XXX disk */
+		currdev.d_kind.efidisk.unit = i;
 		/* XXX should be able to detect this, default to autoprobe */
 		currdev.d_kind.efidisk.slice = -1;
-		/* default to 'a' */
 		currdev.d_kind.efidisk.partition = 0;
+	} else {
+		currdev.d_dev = devsw[1];		/* XXX net */
+		currdev.d_kind.netif.unit = 0;		/* XXX */
 	}
 	currdev.d_type = currdev.d_dev->dv_type;
 

==== //depot/projects/netperf/sys/boot/powerpc/loader/start.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.2 2001/10/07 13:22:25 benno Exp $ */
+/* $FreeBSD: src/sys/boot/powerpc/loader/start.c,v 1.3 2003/08/05 11:30:18 grehan Exp $ */
 /* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */
 
 /*
@@ -38,63 +38,63 @@
 void startup(void *, int, int (*)(void *), char *, int);
 
 #ifdef XCOFF_GLUE
-asm("
-	.text
-	.globl	_entry
-_entry:
-	.long	_start,0,0
+asm("				\n\
+	.text			\n\
+	.globl	_entry		\n\
+_entry:				\n\
+	.long	_start,0,0	\n\
 ");
 #endif
 
-__asm("
-	.data
-stack:
-	.space	16388
-
-	.text
-	.globl	_start
-_start:
-	li	8,0
-	li	9,0x100
-	mtctr	9
-1:
-	dcbf	0,8
-	icbi	0,8
-	addi	8,8,0x20
-	bdnz	1b
-	sync
-	isync
-
-	lis	1,stack@ha
-	addi	1,1,stack@l
-	addi	1,1,8192
-
-	mfmsr	8
-	li	0,0
-	mtmsr	0
-	isync
-
-	mtibatu	0,0
-	mtibatu	1,0
-	mtibatu	2,0
-	mtibatu	3,0
-	mtdbatu	0,0
-	mtdbatu	1,0
-	mtdbatu	2,0
-	mtdbatu	3,0
-
-	li	9,0x12		/* BATL(0, BAT_M, BAT_PP_RW) */
-	mtibatl	0,9
-	mtdbatl	0,9
-	li	9,0x1ffe	/* BATU(0, BAT_BL_256M, BAT_Vs) */
-	mtibatu	0,9
-	mtdbatu	0,9
-	isync
-
-	mtmsr	8
-	isync
-
-	b	startup
+__asm("				\n\
+	.data			\n\
+stack:				\n\
+	.space	16388		\n\
+				\n\
+	.text			\n\
+	.globl	_start		\n\
+_start:				\n\
+	li	%r8,0		\n\
+	li	%r9,0x100	\n\
+	mtctr	%r9		\n\
+1:				\n\
+	dcbf	%r0,%r8		\n\
+	icbi	%r0,%r8		\n\
+	addi	%r8,%r8,0x20	\n\
+	bdnz	1b		\n\
+	sync			\n\
+	isync			\n\
+				\n\
+	lis	%r1,stack@ha	\n\
+	addi	%r1,%r1,stack@l	\n\
+	addi	%r1,%r1,8192	\n\
+				\n\
+	mfmsr	%r8		\n\
+	li	%r0,0		\n\
+	mtmsr	%r0		\n\
+	isync			\n\
+				\n\
+	mtibatu	0,%r0		\n\
+	mtibatu	1,%r0		\n\
+	mtibatu	2,%r0		\n\
+	mtibatu	3,%r0		\n\
+	mtdbatu	0,%r0		\n\
+	mtdbatu	1,%r0		\n\
+	mtdbatu	2,%r0		\n\
+	mtdbatu	3,%r0		\n\
+				\n\
+	li	%r9,0x12     /* BATL(0, BAT_M, BAT_PP_RW) */ \n\
+	mtibatl	0,%r9		\n\
+	mtdbatl	0,%r9		\n\
+	li	%r9,0x1ffe   /* BATU(0, BAT_BL_256M, BAT_Vs) */ \n\
+	mtibatu	0,%r9		\n\
+	mtdbatu	0,%r9		\n\
+	isync			\n\
+				\n\
+	mtmsr	%r8		\n\
+	isync			\n\
+				\n\
+	b	startup		\n\
 ");
 
 void

==== //depot/projects/netperf/sys/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.149 2003/07/29 18:08:16 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.150 2003/08/06 14:24:16 njl Exp $");
 
 #ifdef _KERNEL
 #include "opt_da.h"
@@ -1499,15 +1499,8 @@
 			} else {
 				bp->bio_resid = csio->resid;
 				bp->bio_error = 0;
-				if (bp->bio_resid != 0) {
-					/* Short transfer ??? */
-#if 0
-					if (cmd6workaround(done_ccb) 
-								== ERESTART)
-						return;
-#endif
+				if (bp->bio_resid != 0)
 					bp->bio_flags |= BIO_ERROR;
-				}
 			}
 			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
 				cam_release_devq(done_ccb->ccb_h.path,
@@ -1519,14 +1512,8 @@
 			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
 				panic("REQ_CMP with QFRZN");
 			bp->bio_resid = csio->resid;
-			if (csio->resid > 0) {
-				/* Short transfer ??? */
-#if 0 /* XXX most of the broken umass devices need this ad-hoc work around */
-				if (cmd6workaround(done_ccb) == ERESTART)
-					return;
-#endif
+			if (csio->resid > 0)
 				bp->bio_flags |= BIO_ERROR;
-			}
 		}
 
 		/*

==== //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.67 2003/07/18 10:26:08 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.68 2003/08/04 10:55:22 des Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -253,7 +253,14 @@
 static int
 linprocfs_docpuinfo(PFS_FILL_ARGS)
 {
-	int class, i, fqmhz, fqkhz;
+	int class, fqmhz, fqkhz, ncpu;
+	int name[2], olen, plen;
+	int i;
+
+	name[0] = CTL_HW;
+	name[1] = HW_NCPU;
+	if (kernel_sysctl(td, name, 2, &ncpu, &olen, NULL, 0, &plen) != 0)
+		ncpu = 1;
 
 	/*
 	 * We default the flags to include all non-conflicting flags,
@@ -290,13 +297,16 @@
 		break;
 	}
 
-	sbuf_printf(sb,
-	    "processor\t: %d\n"
-	    "vendor_id\t: %.20s\n"
-	    "cpu family\t: %d\n"
-	    "model\t\t: %d\n"
-	    "stepping\t: %d\n",
-	    0, cpu_vendor, class, cpu, cpu_id & 0xf);
+	for (i = 0; i < ncpu; ++i) {
+		sbuf_printf(sb,
+		    "processor\t: %d\n"
+		    "vendor_id\t: %.20s\n"
+		    "cpu family\t: %d\n"
+		    "model\t\t: %d\n"
+		    "stepping\t: %d\n",
+		    i, cpu_vendor, class, cpu, cpu_id & 0xf);
+		/* XXX per-cpu vendor / class / id? */
+	}
 
 	sbuf_cat(sb,
 	    "flags\t\t:");

==== //depot/projects/netperf/sys/conf/NOTES#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1165 2003/07/29 04:32:32 njl Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1166 2003/08/03 13:39:59 phk Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -726,14 +726,6 @@
 # images of type mfs_root or md_root.
 options 	MD_ROOT
 
-# Allow this many swap-devices.
-#
-# In order to manage swap, the system must reserve bitmap space that
-# scales with the largest mounted swap device multiplied by NSWAPDEV, 
-# irrespective of whether other swap devices exist.  So it is not a
-# good idea to make this value too large.
-options 	NSWAPDEV=5
-

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308061636.h76GaFpQ058312>