PERFORCE change 36132 for review

Sam Leffler sam at FreeBSD.org
Thu Aug 14 12:44:51 PDT 2003


http://perforce.freebsd.org/chv.cgi?CH=36132

Change 36132 by sam at sam_ebb on 2003/08/14 12:44:29

	IFC

Affected files ...

.. //depot/projects/netperf/sys/alpha/alpha/pmap.c#4 integrate
.. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#4 integrate
.. //depot/projects/netperf/sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/netperf/sys/boot/i386/libi386/biosacpi.c#2 integrate
.. //depot/projects/netperf/sys/boot/i386/libi386/biospnp.c#2 integrate
.. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/netperf/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/netperf/sys/conf/NOTES#4 integrate
.. //depot/projects/netperf/sys/conf/files#2 integrate
.. //depot/projects/netperf/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/netperf/sys/conf/options#4 integrate
.. //depot/projects/netperf/sys/contrib/dev/acpica/acfreebsd.h#2 integrate
.. //depot/projects/netperf/sys/contrib/dev/acpica/common/adisasm.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/common/getopt.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslanalyze.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcodegen.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompile.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompiler.h#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompiler.l#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslcompiler.y#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslerror.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslfiles.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslfold.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslglobal.h#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asllength.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asllisting.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslload.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asllookup.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslmain.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslmap.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslopcodes.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asloperands.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslopt.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslresource.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslrestype1.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslrestype2.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslstubs.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltransform.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltree.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/asltypes.h#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/compiler/aslutils.c#1 branch
.. //depot/projects/netperf/sys/contrib/dev/acpica/osunixxf.c#1 branch
.. //depot/projects/netperf/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#2 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_battery.c#2 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_button.c#3 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#2 integrate
.. //depot/projects/netperf/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/netperf/sys/dev/amd/amd.c#3 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#2 integrate
.. //depot/projects/netperf/sys/dev/ct/ct.c#2 integrate
.. //depot/projects/netperf/sys/dev/dgb/dgreg.h#2 integrate
.. //depot/projects/netperf/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/netperf/sys/dev/digi/digi.h#3 integrate
.. //depot/projects/netperf/sys/dev/digi/digireg.h#2 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed_cbus.c#2 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed_pccard.c#3 integrate
.. //depot/projects/netperf/sys/dev/en/midwayvar.h#3 integrate
.. //depot/projects/netperf/sys/dev/fatm/if_fatm.c#4 integrate
.. //depot/projects/netperf/sys/dev/fatm/if_fatmvar.h#3 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#3 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatm_ioctl.c#4 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatm_tx.c#4 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#4 integrate
.. //depot/projects/netperf/sys/dev/ida/ida_disk.c#2 integrate
.. //depot/projects/netperf/sys/dev/ie/if_ievar.h#2 integrate
.. //depot/projects/netperf/sys/dev/iicbus/iic.c#2 integrate
.. //depot/projects/netperf/sys/dev/iicbus/iicsmb.c#2 integrate
.. //depot/projects/netperf/sys/dev/md/md.c#4 integrate
.. //depot/projects/netperf/sys/dev/mlx/mlx.c#2 integrate
.. //depot/projects/netperf/sys/dev/mly/mly.c#2 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patm.c#3 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patm_ioctl.c#4 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patmvar.h#3 integrate
.. //depot/projects/netperf/sys/dev/pccard/pccarddevs#3 integrate
.. //depot/projects/netperf/sys/dev/pccard/pccarddevs.h#3 integrate
.. //depot/projects/netperf/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/netperf/sys/dev/pccbb/pccbbreg.h#2 integrate
.. //depot/projects/netperf/sys/dev/ppbus/ppbconf.h#2 integrate
.. //depot/projects/netperf/sys/dev/rc/rc.c#2 integrate
.. //depot/projects/netperf/sys/dev/smbus/smb.c#2 integrate
.. //depot/projects/netperf/sys/dev/snc/dp83932.c#2 integrate
.. //depot/projects/netperf/sys/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/netperf/sys/dev/sound/pci/ich.h#2 integrate
.. //depot/projects/netperf/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/netperf/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/netperf/sys/dev/wi/if_wi_pci.c#4 integrate
.. //depot/projects/netperf/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/netperf/sys/i386/i386/i686_mem.c#2 integrate
.. //depot/projects/netperf/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/netperf/sys/i386/ibcs2/ibcs2_stat.c#2 integrate
.. //depot/projects/netperf/sys/i386/include/cpufunc.h#3 integrate
.. //depot/projects/netperf/sys/i386/isa/spigot.c#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/exception.S#3 integrate
.. //depot/projects/netperf/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/netperf/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/netperf/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/netperf/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/netperf/sys/ia64/include/cpu.h#4 integrate
.. //depot/projects/netperf/sys/ia64/include/ieeefp.h#2 integrate
.. //depot/projects/netperf/sys/ia64/include/ucontext.h#3 integrate
.. //depot/projects/netperf/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/netperf/sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/netperf/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/netperf/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/netperf/sys/kern/link_elf.c#3 integrate
.. //depot/projects/netperf/sys/kern/subr_param.c#2 integrate
.. //depot/projects/netperf/sys/kern/sys_pipe.c#3 integrate
.. //depot/projects/netperf/sys/kern/sys_process.c#3 integrate
.. //depot/projects/netperf/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/netperf/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/netperf/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/netperf/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/netperf/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/netperf/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/netperf/sys/libkern/random.c#2 integrate
.. //depot/projects/netperf/sys/modules/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/netgraph/atm/Makefile#2 integrate
.. //depot/projects/netperf/sys/modules/netgraph/atm/atmpif/Makefile#1 branch
.. //depot/projects/netperf/sys/net/if_loop.c#3 integrate
.. //depot/projects/netperf/sys/netgraph/atm/atmpif/ng_atmpif.c#1 branch
.. //depot/projects/netperf/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#1 branch
.. //depot/projects/netperf/sys/netgraph/atm/atmpif/ng_atmpif_var.h#1 branch
.. //depot/projects/netperf/sys/netgraph/atm/ng_atmpif.h#1 branch
.. //depot/projects/netperf/sys/netinet/in.h#2 integrate
.. //depot/projects/netperf/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/netperf/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/netperf/sys/netinet/ip_mroute.c#3 integrate
.. //depot/projects/netperf/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/netperf/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/netperf/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/netperf/sys/netinet/pim.h#1 branch
.. //depot/projects/netperf/sys/netinet/pim_var.h#1 branch
.. //depot/projects/netperf/sys/netinet/raw_ip.c#3 integrate
.. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/netperf/sys/pc98/pc98/clock.c#2 integrate
.. //depot/projects/netperf/sys/pci/if_rl.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/netperf/sys/pci/meteor.c#2 integrate
.. //depot/projects/netperf/sys/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/netperf/sys/sys/mman.h#2 integrate
.. //depot/projects/netperf/sys/sys/namei.h#2 integrate
.. //depot/projects/netperf/sys/sys/pipe.h#2 integrate
.. //depot/projects/netperf/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/netperf/sys/vm/uma_core.c#5 integrate
.. //depot/projects/netperf/sys/vm/uma_int.h#3 integrate
.. //depot/projects/netperf/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/netperf/sys/vm/vm_glue.c#3 integrate
.. //depot/projects/netperf/sys/vm/vm_init.c#2 integrate
.. //depot/projects/netperf/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/netperf/sys/vm/vm_kern.h#2 integrate
.. //depot/projects/netperf/sys/vm/vm_map.c#2 integrate
.. //depot/projects/netperf/sys/vm/vm_map.h#2 integrate
.. //depot/projects/netperf/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/netperf/sys/vm/vm_unix.c#2 integrate

Differences ...

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

@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.132 2003/07/31 03:39:50 bmilekic Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.133 2003/08/07 18:35:16 gallatin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1552,10 +1552,11 @@
 	pv->pv_pmap = pmap;
 	pv->pv_ptem = mpte;
 
+	vm_page_lock_queues();
 	TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist);
 	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
 	m->md.pv_list_count++;
-
+	vm_page_unlock_queues();
 	splx(s);
 }
 

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

@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.91 2003/07/31 01:31:31 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.92 2003/08/11 01:38:23 marcel Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -248,8 +248,6 @@
 void
 cpu_thread_exit(struct thread *td)
 {
-
-	return;
 }
 
 void
@@ -318,8 +316,31 @@
 void
 cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku)
 {
+	struct pcb *pcb;
+	struct trapframe *tf;
+	uint64_t stack;
 
-	/* XXX */
+	pcb = td->td_pcb;
+	tf = td->td_frame;
+	stack = ((uint64_t)ku->ku_stack.ss_sp + ku->ku_stack.ss_size) & ~15;
+
+	bzero(tf->tf_regs, FRAME_SIZE * sizeof(tf->tf_regs[0]));
+	bzero(&pcb->pcb_fp, sizeof(pcb->pcb_fp));
+	pcb->pcb_fp_control = 0;
+	pcb->pcb_fp.fpr_cr = FPCR_DYN_NORMAL | FPCR_INVD | FPCR_DZED |
+	    FPCR_OVFD | FPCR_INED | FPCR_UNFD;
+	if (td != curthread) {
+		pcb->pcb_hw.apcb_usp = stack;
+		pcb->pcb_hw.apcb_unique = 0;
+	} else {
+		alpha_pal_wrusp(stack);
+		alpha_pal_wrunique(0);
+	}
+	tf->tf_regs[FRAME_PS] = ALPHA_PSL_USERSET;
+	tf->tf_regs[FRAME_PC] = (u_long)ku->ku_func;
+	tf->tf_regs[FRAME_A0] = (u_long)ku->ku_mailbox;
+	tf->tf_regs[FRAME_T12] = tf->tf_regs[FRAME_PC];	/* aka. PV */
+	tf->tf_regs[FRAME_FLAGS] = 0;			/* full restore */
 }
 
 /*

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

@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.428 2003/08/02 19:26:08 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.430 2003/08/10 21:53:55 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -208,7 +208,7 @@
 static PMAP_INLINE void	free_pv_entry(pv_entry_t pv);
 static pv_entry_t get_pv_entry(void);
 static void	amd64_protection_init(void);
-static void	pmap_changebit(vm_page_t m, int bit, boolean_t setem)
+static void	pmap_clear_ptes(vm_page_t m, int bit)
     __always_inline;
 
 static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva);
@@ -1466,10 +1466,12 @@
 	pv->pv_pmap = pmap;
 	pv->pv_ptem = mpte;
 
+	vm_page_lock_queues();
 	TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist);
 	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
 	m->md.pv_list_count++;
 
+	vm_page_unlock_queues();
 	splx(s);
 }
 
@@ -2609,17 +2611,17 @@
 }
 
 /*
- * this routine is used to modify bits in ptes
+ *	Clear the given bit in each of the given page's ptes.
  */
 static __inline void
-pmap_changebit(vm_page_t m, int bit, boolean_t setem)
+pmap_clear_ptes(vm_page_t m, int bit)
 {
 	register pv_entry_t pv;
-	register pt_entry_t *pte;
+	pt_entry_t pbits, *pte;
 	int s;
 
 	if (!pmap_initialized || (m->flags & PG_FICTITIOUS) ||
-	    (!setem && bit == PG_RW && (m->flags & PG_WRITEABLE) == 0))
+	    (bit == PG_RW && (m->flags & PG_WRITEABLE) == 0))
 		return;
 
 	s = splvm();
@@ -2632,7 +2634,7 @@
 		/*
 		 * don't write protect pager mappings
 		 */
-		if (!setem && (bit == PG_RW)) {
+		if (bit == PG_RW) {
 			if (!pmap_track_modified(pv->pv_va))
 				continue;
 		}
@@ -2645,26 +2647,20 @@
 #endif
 
 		pte = pmap_pte(pv->pv_pmap, pv->pv_va);
-
-		if (setem) {
-			*pte |= bit;
-			pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
-		} else {
-			pt_entry_t pbits = *pte;
-			if (pbits & bit) {
-				if (bit == PG_RW) {
-					if (pbits & PG_M) {
-						vm_page_dirty(m);
-					}
-					pte_store(pte, pbits & ~(PG_M|PG_RW));
-				} else {
-					pte_store(pte, pbits & ~bit);
+		pbits = *pte;
+		if (pbits & bit) {
+			if (bit == PG_RW) {
+				if (pbits & PG_M) {
+					vm_page_dirty(m);
 				}
-				pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
+				pte_store(pte, pbits & ~(PG_M|PG_RW));
+			} else {
+				pte_store(pte, pbits & ~bit);
 			}
+			pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
 		}
 	}
-	if (!setem && bit == PG_RW)
+	if (bit == PG_RW)
 		vm_page_flag_clear(m, PG_WRITEABLE);
 	splx(s);
 }
@@ -2679,7 +2675,7 @@
 {
 	if ((prot & VM_PROT_WRITE) == 0) {
 		if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) {
-			pmap_changebit(m, PG_RW, FALSE);
+			pmap_clear_ptes(m, PG_RW);
 		} else {
 			pmap_remove_all(m);
 		}
@@ -2750,7 +2746,7 @@
 void
 pmap_clear_modify(vm_page_t m)
 {
-	pmap_changebit(m, PG_M, FALSE);
+	pmap_clear_ptes(m, PG_M);
 }
 
 /*
@@ -2761,7 +2757,7 @@
 void
 pmap_clear_reference(vm_page_t m)
 {
-	pmap_changebit(m, PG_A, FALSE);
+	pmap_clear_ptes(m, PG_A);
 }
 
 /*

==== //depot/projects/netperf/sys/boot/i386/libi386/biosacpi.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/i386/libi386/biosacpi.c,v 1.5 2003/07/13 22:54:53 njl Exp $
+ * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.6 2003/08/07 14:53:14 njl Exp $
  */
 
 #include <stand.h>
@@ -66,6 +66,7 @@
     sprintf(buf, "%d", revision);
     setenv("hint.acpi.0.revision", buf, 1);
     sprintf(buf, "%6s", rsdp->OemId);
+    buf[6] = '\0';
     setenv("hint.acpi.0.oem", buf, 1);
     sprintf(buf, "0x%08x", rsdp->RsdtPhysicalAddress);
     setenv("hint.acpi.0.rsdt", buf, 1);

==== //depot/projects/netperf/sys/boot/i386/libi386/biospnp.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/i386/libi386/biospnp.c,v 1.7 2002/09/23 18:54:26 alfred Exp $
+ * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.8 2003/08/07 15:04:24 jhb Exp $
  */
 
 /*
@@ -263,7 +263,7 @@
 	switch(*p) {
 
 	case 'w':
-	    i = va_arg(ap, uint);
+	    i = va_arg(ap, u_int);
 	    *(u_int16_t *)argp = i;
 	    argp += sizeof(u_int16_t);
 	    break;

==== //depot/projects/netperf/sys/cam/scsi/scsi_da.c#5 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.150 2003/08/06 14:24:16 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.151 2003/08/06 17:30:03 njl Exp $");
 
 #ifdef _KERNEL
 #include "opt_da.h"
@@ -146,21 +146,6 @@
 
 static struct da_quirk_entry da_quirk_table[] =
 {
-#ifdef DA_OLD_QUIRKS
-	/*
-	 * Logitec USB/Firewire LHD-P30FU
-	 */
-	{
-		/* USB part */
-		{T_DIRECT, SIP_MEDIA_FIXED, "HITACHI_", "DK23DA*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/* Firewire part */
-		{T_DIRECT, SIP_MEDIA_FIXED, "LSILogic", "SYM13FW*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-#endif /* DA_OLD_QUIRKS */
 	{
 		/*
 		 * Fujitsu M2513A MO drives.
@@ -296,24 +281,6 @@
 	},
 	{
 		/*
-		 * Maxtor 3000LE USB Drive
-		 */
-		{T_DIRECT, SIP_MEDIA_FIXED, "MAXTOR*", "K040H2*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * LaCie USB drive, among others
-		 */
-		{T_DIRECT, SIP_MEDIA_FIXED, "Maxtor*", "D080H4*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		{T_OPTICAL, SIP_MEDIA_REMOVABLE, "FUJITSU", "MCF3064AP", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
 		 * Microtech USB CameraMate
 		 */
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "eUSB    Compact*",
@@ -338,13 +305,6 @@
 	},
 	{
 		/*
-		 * Olympus digital cameras (D-370)
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "D-*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
 		 * Olympus digital cameras (E-100RS, E-10).
 		 */
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "OLYMPUS", "E-*", "*"},
@@ -367,34 +327,6 @@
  	},
 	{
 		/*
-		 * Nikon Coolpix E775/E995 Cameras 
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "NIKON", "NIKON DSC E*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * Nikon Coolpix E885 Camera
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "Nikon", "Digital Camera", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * SimpleTech FlashLink UCF-100
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "OEI-USB", "CompactFlash", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * Minolta Dimage 2330
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DIMAGE 2330*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
 		 * Minolta Dimage E203
 		 */
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"},
@@ -402,21 +334,6 @@
 	},
 	{
 		/*
-		 * DIVA USB Mp3 Player.
-		 * PR: kern/33638
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "DIVA USB", "Media Reader","*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * Daisy Technology PhotoClip USB Camera
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "Digital", "World   DMC","*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
 		 * Apacer HandyDrive
 		 * PR: kern/43627
 		 */
@@ -433,22 +350,6 @@
 	},
 	{
 		/*
-		 * HP 315 Digital Camera
-		 * PR: kern/41010
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "HP", "USB CAMERA", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * Fujitsu-Siemens Memorybird pen drive
-		 * PR: kern/34712
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "Fujitsu", "Memorybird", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
 		 * Sony USB Key-Storage
 		 * PR: kern/46386
 		 */
@@ -457,71 +358,12 @@
 	},
 	{
 		/*
-		 * Lexar Media Jumpdrive
-		 * PR: kern/47006
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "LEXAR", "DIGITAL FILM", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * Pentax USB Optio 230 camera
-		 * PR: kern/46369
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE,
-		 "PENTAX", "DIGITAL_CAMERA", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * Casio QV-R3 USB camera (uses Pentax chip as above)
-		 * PR: kern/46545
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE,
-		 "CASIO", "DIGITAL_CAMERA", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * M-Systems DiskOnKey USB flash key
-		 * PR: kern/47793
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "M-Sys", "DiskOnKey", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * SanDisk ImageMate (I, II, ...) compact flash
-		 * PR: kern/47877
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "SanDisk", "ImageMate*", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
-		 * Feiya "slider" dual-slot flash reader. The vendor field
-		 * is blank so this may match other devices.
-		 * PR: kern/50020
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "", "USB CARD READER", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	},
-	{
-		/*
 		 * SmartDisk (Mitsumi) USB floppy drive
 		 * PR: kern/50226
 		 */
 		{T_DIRECT, SIP_MEDIA_REMOVABLE, "MITSUMI", "USB FDD", "*"},
 		/*quirks*/ DA_Q_NO_SYNC_CACHE
 	},
-	{
-		/*
-		 * OTi USB Flash Key
-		 * PR: kern/51825
-		 */
-		{T_DIRECT, SIP_MEDIA_REMOVABLE, "OTi", "Flash Disk", "*"},
-		/*quirks*/ DA_Q_NO_6_BYTE
-	}
 #endif /* DA_OLD_QUIRKS */
 };
 

==== //depot/projects/netperf/sys/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.65 2003/06/22 08:41:41 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.66 2003/08/06 18:40:49 phk Exp $");
 
 #include "opt_mac.h"
 
@@ -810,8 +810,6 @@
 	return 0;
 }
 
-extern int swap_pager_full;
-
 /* ARGSUSED */
 int
 svr4_sys_break(td, uap)

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1166 2003/08/03 13:39:59 phk Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1168 2003/08/11 08:40:01 harti Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -442,6 +442,7 @@
 options 	NETGRAPH_TTY
 options 	NETGRAPH_UI
 options 	NETGRAPH_VJC
+options		NETGRAPH_ATM_ATMPIF
 
 # NgATM - Netgraph ATM
 options		NGATM_ATM
@@ -530,6 +531,9 @@
 # MROUTING enables the kernel multicast packet forwarder, which works
 # with mrouted(8).
 #
+# PIM enables Protocol Independent Multicast in the kernel.
+# Requires MROUTING enabled.
+#
 # IPFIREWALL enables support for IP firewall construction, in
 # conjunction with the `ipfw' program.  IPFIREWALL_VERBOSE sends
 # logged packets to the system logger.  IPFIREWALL_VERBOSE_LIMIT
@@ -565,6 +569,7 @@
 # using the trpt(8) utility.
 #
 options 	MROUTING		# Multicast routing
+options 	PIM			# Protocol Independent Multicast
 options 	IPFIREWALL		#firewall
 options 	IPFIREWALL_VERBOSE	#enable logging to syslogd(8)
 options 	IPFIREWALL_FORWARD	#enable transparent proxy support

==== //depot/projects/netperf/sys/conf/files#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.811 2003/07/22 11:41:15 ticso Exp $
+# $FreeBSD: src/sys/conf/files,v 1.813 2003/08/11 08:40:01 harti Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -75,9 +75,9 @@
 contrib/dev/acpica/dbexec.c	 optional acpi acpi_debug
 contrib/dev/acpica/dbfileio.c	 optional acpi acpi_debug
 contrib/dev/acpica/dbhistry.c	 optional acpi acpi_debug
-contrib/dev/acpica/dbinput.c	 optional acpi acpi_debug nowerror
+contrib/dev/acpica/dbinput.c	 optional acpi acpi_debug
 contrib/dev/acpica/dbstats.c	 optional acpi acpi_debug
-contrib/dev/acpica/dbutils.c	 optional acpi acpi_debug nowerror
+contrib/dev/acpica/dbutils.c	 optional acpi acpi_debug
 contrib/dev/acpica/dbxface.c	 optional acpi acpi_debug
 contrib/dev/acpica/dmbuffer.c	 optional acpi acpi_debug
 contrib/dev/acpica/dmnames.c	 optional acpi acpi_debug
@@ -101,7 +101,7 @@
 contrib/dev/acpica/dswstate.c	 optional acpi
 contrib/dev/acpica/evevent.c	 optional acpi
 contrib/dev/acpica/evgpe.c	 optional acpi
-contrib/dev/acpica/evgpeblk.c	 optional acpi nowerror
+contrib/dev/acpica/evgpeblk.c	 optional acpi
 contrib/dev/acpica/evmisc.c	 optional acpi
 contrib/dev/acpica/evregion.c	 optional acpi
 contrib/dev/acpica/evrgnini.c	 optional acpi
@@ -1338,6 +1338,8 @@
 netatm/uni/unisig_subr.c	optional atm_uni atm_core
 netatm/uni/unisig_util.c	optional atm_uni atm_core
 netatm/uni/unisig_vc_state.c	optional atm_uni atm_core
+netgraph/atm/atmpif/ng_atmpif.c	optional netgraph_atm_atmpif
+netgraph/atm/atmpif/ng_atmpif_harp.c	optional netgraph_atm_atmpif
 netgraph/atm/ng_atm.c	optional ngatm_atm
 netgraph/ng_UI.c	optional netgraph_UI
 netgraph/ng_async.c	optional netgraph_async

==== //depot/projects/netperf/sys/conf/kern.post.mk#2 (text+ko) ====

@@ -6,7 +6,7 @@
 # should be defined in the kern.pre.mk so that port makefiles can
 # override or augment them.
 #
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.48 2003/07/22 09:02:21 phk Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.49 2003/08/07 19:12:06 ru Exp $
 #
 
 # In case the config had a makeoptions DESTDIR...
@@ -178,7 +178,7 @@
 	fi
 .if exists(${DESTDIR}${KODIR})
 	-thiskernel=`sysctl -n kern.bootfile` ; \
-	if [ "$$thiskernel" = ${DESTDIR}${KODIR}.old/${KERNEL_KO} ] ; then \
+	if [ "`dirname "$$thiskernel"`" != ${DESTDIR}${KODIR} ] ; then \
 		chflags -R noschg ${DESTDIR}${KODIR} ; \
 		rm -rf ${DESTDIR}${KODIR} ; \
 	else \
@@ -187,9 +187,7 @@
 			rm -rf ${DESTDIR}${KODIR}.old ; \
 		fi ; \
 		mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
-		if [ "$$thiskernel" = ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \
-			sysctl kern.bootfile=${DESTDIR}${KODIR}.old/${KERNEL_KO} ; \
-		fi; \
+		sysctl kern.bootfile=${DESTDIR}${KODIR}.old/"`basename "$$thiskernel"`" ; \
 	fi
 .endif
 	mkdir -p ${DESTDIR}${KODIR}

==== //depot/projects/netperf/sys/conf/options#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.407 2003/08/03 13:39:59 phk Exp $
+# $FreeBSD: src/sys/conf/options,v 1.409 2003/08/11 08:40:01 harti Exp $
 #
 #        On the handling of kernel options
 #
@@ -322,6 +322,7 @@
 ETHER_8022		opt_ef.h
 ETHER_SNAP		opt_ef.h
 MROUTING		opt_mrouting.h
+PIM			opt_mrouting.h
 INET			opt_inet.h
 INET6			opt_inet6.h
 IPSEC			opt_ipsec.h
@@ -395,6 +396,7 @@
 NETGRAPH_TTY		opt_netgraph.h
 NETGRAPH_UI		opt_netgraph.h
 NETGRAPH_VJC		opt_netgraph.h
+NETGRAPH_ATM_ATMPIF	opt_netgraph.h
 
 # NgATM options
 NGATM_ATM		opt_netgraph.h

==== //depot/projects/netperf/sys/contrib/dev/acpica/acfreebsd.h#2 (text+ko) ====

@@ -118,8 +118,9 @@
 #define __ACFREEBSD_H__
 
 /*
- * XXX this is technically correct, but will cause problems with some ASL
- *     which only works if the string names a Microsoft operating system.
+ * Some systems' ASL may have problems because they look for names 
+ * of Microsoft operating systems.  To override this, set hw.acpi.os_name
+ * to the appropriate string.
  */
 #define ACPI_OS_NAME                "FreeBSD"
 
@@ -159,6 +160,8 @@
 
 /* Not building kernel code, so use libc */
 #define ACPI_USE_STANDARD_HEADERS
+#define ACPI_FLUSH_CPU_CACHE()
+#include <sys/types.h>
 
 #define __cli()
 #define __sti()

==== //depot/projects/netperf/sys/dev/aac/aacvar.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/dev/aac/aacvar.h,v 1.35 2003/07/09 21:16:23 scottl Exp $
+ *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.36 2003/08/07 15:04:24 jhb Exp $
  */
 
 #include <sys/bio.h>
@@ -314,7 +314,7 @@
 	/* command/fib resources */
 	bus_dma_tag_t		aac_fib_dmat;	/* DMA tag for allocing FIBs */
 	TAILQ_HEAD(,aac_fibmap)	aac_fibmap_tqh;
-	uint			total_fibs;
+	u_int			total_fibs;
 	struct aac_command	*aac_commands;
 
 	/* command management */

==== //depot/projects/netperf/sys/dev/acpica/acpi.c#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/dev/acpica/acpi.c,v 1.93 2003/07/20 00:52:57 njl Exp $
+ *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.94 2003/08/08 03:19:22 njl Exp $
  */
 
 #include "opt_acpi.h"
@@ -433,8 +433,13 @@
     SYSCTL_ADD_INT(&sc->acpi_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree),
 		   OID_AUTO, "disable_on_poweroff", CTLFLAG_RD | CTLFLAG_RW,
 		   &sc->acpi_disable_on_poweroff, 0, "ACPI subsystem disable on poweroff");
+
+    /*
+     * Default to 5 seconds before sleeping to give some machines time to
+     * stabilize.
+     */
+    sc->acpi_sleep_delay = 5;
     sc->acpi_disable_on_poweroff = 1;
-    sc->acpi_sleep_delay = 0;
     sc->acpi_s4bios = 1;
     if (bootverbose)
 	sc->acpi_verbose = 1;

==== //depot/projects/netperf/sys/dev/acpica/acpi_acad.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/dev/acpica/acpi_acad.c,v 1.14 2003/02/15 01:46:22 takawata Exp $
+ * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.15 2003/08/11 15:34:43 njl Exp $
  */
 
 #include "opt_acpi.h"
@@ -43,240 +43,230 @@
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpiio.h>
  
-/*
- * Hooks for the ACPI CA debugging infrastructure
- */
+/* Hooks for the ACPI CA debugging infrastructure */
 #define _COMPONENT	ACPI_AC_ADAPTER
 ACPI_MODULE_NAME("AC_ADAPTER")
 
+/* Number of times to retry initialization before giving up. */
+#define ACPI_ACAD_RETRY_MAX		6
+
 #define ACPI_DEVICE_CHECK_PNP		0x00
 #define ACPI_DEVICE_CHECK_EXISTENCE	0x01
 #define ACPI_POWERSOURCE_STAT_CHANGE	0x80
 
-static void acpi_acad_get_status(void * );
-static void acpi_acad_notify_handler(ACPI_HANDLE , UINT32 ,void *);
-static int acpi_acad_probe(device_t);
-static int acpi_acad_attach(device_t);
-static int acpi_acad_ioctl(u_long, caddr_t, void *);
-static int acpi_acad_sysctl(SYSCTL_HANDLER_ARGS);
-static void acpi_acad_init_acline(void *arg);
+struct	acpi_acad_softc {
+    int status;
+    int initializing;
+};
+
+static void	acpi_acad_get_status(void *);
+static void	acpi_acad_notify_handler(ACPI_HANDLE, UINT32, void *);
+static int	acpi_acad_probe(device_t);
+static int	acpi_acad_attach(device_t);
+static int	acpi_acad_ioctl(u_long, caddr_t, void *);
+static int	acpi_acad_sysctl(SYSCTL_HANDLER_ARGS);
+static void	acpi_acad_init_acline(void *arg);
+
+static device_method_t acpi_acad_methods[] = {
+    /* Device interface */
+    DEVMETHOD(device_probe,	acpi_acad_probe),
+    DEVMETHOD(device_attach,	acpi_acad_attach),
 
-struct  acpi_acad_softc {
-	int status;
+    {0, 0}
+};
 
-	int initializing;
+static driver_t acpi_acad_driver = {
+    "acpi_acad",
+    acpi_acad_methods,
+    sizeof(struct acpi_acad_softc),
 };
 
+static devclass_t acpi_acad_devclass;
+DRIVER_MODULE(acpi_acad, acpi, acpi_acad_driver, acpi_acad_devclass, 0, 0);
+
 static void
 acpi_acad_get_status(void *context)
 {
-	int newstatus;
-	device_t dev = context;
-	struct acpi_acad_softc *sc = device_get_softc(dev);
-	ACPI_HANDLE h = acpi_get_handle(dev);
+    struct acpi_acad_softc *sc;
+    device_t	dev;
+    ACPI_HANDLE	h;
+    int		newstatus;
+
+    dev = context;
+    sc = device_get_softc(dev);
+    h = acpi_get_handle(dev);
+    if (ACPI_FAILURE(acpi_EvaluateInteger(h, "_PSR", &newstatus))) {
+	sc->status = -1;
+	return;
+    }
 
-	if (ACPI_FAILURE(acpi_EvaluateInteger(h, "_PSR", &newstatus))) {
-		sc->status = -1;
-		return;
-	}
+    if (sc->status != newstatus) {
+	sc->status = newstatus;
 
-	if (sc->status != newstatus) {
-		sc->status = newstatus;
-		/* set system power profile based on AC adapter status */
-		power_profile_set_state(sc->status ? POWER_PROFILE_PERFORMANCE : POWER_PROFILE_ECONOMY);
-		ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
-		    "%s Line\n",(sc->status) ? "On" : "Off");
-	}
+	/* Set system power profile based on AC adapter status */
+	power_profile_set_state(sc->status ? POWER_PROFILE_PERFORMANCE :
+				POWER_PROFILE_ECONOMY);
+	ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
+		    "%s Line\n", sc->status ? "On" : "Off");
+    }
 }
 
 static void
 acpi_acad_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
 {
-	device_t dev = context;
+    device_t dev = context;
 
-	ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
-	    "Notify %d\n", notify);
+    ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev),
+		"Notify %d\n", notify);
 
-	switch (notify) {
-	case ACPI_DEVICE_CHECK_PNP:
-	case ACPI_DEVICE_CHECK_EXISTENCE:
-	case ACPI_POWERSOURCE_STAT_CHANGE:
-		/*Temporally. It is better to notify policy manager*/
-		AcpiOsQueueForExecution(OSD_PRIORITY_LO,
-		    acpi_acad_get_status,context);
-		break;
-	default:
-		break;
-	}
+    switch (notify) {

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


More information about the p4-projects mailing list