PERFORCE change 83401 for review

Robert Watson rwatson at FreeBSD.org
Sun Sep 11 08:21:44 PDT 2005 

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

Change 83401 by rwatson at rwatson_peppercorn on 2005/09/11 15:20:44

	Integrate netsmp branch.

Affected files ...

.. //depot/projects/netsmp/src/sys/alpha/alpha/db_trace.c#3 integrate
.. //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/db_trace.c#4 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/netsmp/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/netsmp/src/sys/arm/arm/db_trace.c#3 integrate
.. //depot/projects/netsmp/src/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/netsmp/src/sys/conf/files#8 integrate
.. //depot/projects/netsmp/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/netsmp/src/sys/conf/files.ia64#2 integrate
.. //depot/projects/netsmp/src/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/netsmp/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/netsmp/src/sys/conf/kmod.mk#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#5 integrate
.. //depot/projects/netsmp/src/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/netsmp/src/sys/ddb/db_watch.c#2 integrate
.. //depot/projects/netsmp/src/sys/ddb/ddb.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/ata/ata-raid.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/ctau/if_ct.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/ed/if_ed.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/ed/if_ed_novell.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/ed/if_ed_pccard.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/ed/if_edreg.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ed/if_edvar.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/hme/if_hme.c#9 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/access601.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/amd64-elf.raid.o.uu#1 branch
.. //depot/projects/netsmp/src/sys/dev/hptmv/array.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/atapi.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/command.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/entry.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/global.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/gui_lib.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/hptintf.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/hptproc.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/ioctl.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/mv.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/mvOs.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/mvSata.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/mvStorageDev.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/osbsd.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/raid5n.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/readme.txt#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/vdevice.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/pccard/pccarddevs#3 integrate
.. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/mss.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/sb16.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/csapcm.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/channel.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/channel.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/fake.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/sound.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/sound.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/vchan.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/usb/uaudio.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/syscons/scmouse.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/syscons/scvidctl.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_cam.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_includes.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_ioctl.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_share.h#2 integrate
.. //depot/projects/netsmp/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/eli/g_eli.c#4 integrate
.. //depot/projects/netsmp/src/sys/geom/geom.h#2 integrate
.. //depot/projects/netsmp/src/sys/geom/geom_event.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate
.. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/fs.h#2 integrate
.. //depot/projects/netsmp/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/conf/PAE#3 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/db_trace.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/netsmp/src/sys/i386/pci/pci_pir.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia32/ia32_reg.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia32/ia32_sigtramp.c#2 delete
.. //depot/projects/netsmp/src/sys/ia64/ia64/db_interface.c#2 delete
.. //depot/projects/netsmp/src/sys/ia64/ia64/db_machdep.c#1 branch
.. //depot/projects/netsmp/src/sys/ia64/ia64/db_trace.c#3 delete
.. //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia64/mp_machdep.c#4 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia64/trap.c#3 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/ia64/include/pmap.h#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_acl.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_cpu.c#5 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_lock.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_poll.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_shutdown.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_tc.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_witness.c#8 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/netsmp/src/sys/modules/Makefile#4 integrate
.. //depot/projects/netsmp/src/sys/modules/hptmv/Makefile#2 integrate
.. //depot/projects/netsmp/src/sys/net/bpf.c#5 integrate
.. //depot/projects/netsmp/src/sys/net/bpfdesc.h#4 integrate
.. //depot/projects/netsmp/src/sys/net/if.c#14 integrate
.. //depot/projects/netsmp/src/sys/net/if_bridge.c#9 integrate
.. //depot/projects/netsmp/src/sys/net/if_ethersubr.c#8 integrate
.. //depot/projects/netsmp/src/sys/net/rtsock.c#8 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_ksocket.c#3 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_pptpgre.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet/if_ether.c#5 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6.c#5 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_ifattach.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_var.h#8 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ip6_mroute.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ip6_output.c#6 integrate
.. //depot/projects/netsmp/src/sys/netinet6/mld6.c#6 integrate
.. //depot/projects/netsmp/src/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/netsmp/src/sys/netinet6/nd6_nbr.c#6 integrate
.. //depot/projects/netsmp/src/sys/netipx/ipx_proto.c#2 integrate
.. //depot/projects/netsmp/src/sys/netnatm/natm_proto.c#2 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/db_hwwatch.c#2 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/pmap.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/sparc64/db_hwwatch.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/netsmp/src/sys/sys/acl.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/buf.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/callout.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/iconv.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/kernel.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/ktr.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/sx.h#2 integrate
.. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/netsmp/src/sys/vm/pmap.h#2 integrate
.. //depot/projects/netsmp/src/sys/vm/uma_core.c#4 integrate
.. //depot/projects/netsmp/src/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/netsmp/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/hash1.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/hash1.0.stdout#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/hash2.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/hash2.0.stdout#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/hash3.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/hash3.0.stdout#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/return1.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/return2.1#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/builtins/return3.1#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/regress.sh#2 integrate
.. //depot/projects/netsmp/src/tools/regression/bin/sh/set-e/for1.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/set-e/func1.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/set-e/func2.1#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/set-e/until3.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/bin/sh/set-e/while3.0#1 branch
.. //depot/projects/netsmp/src/tools/regression/fifo/fifo_create/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/fifo/fifo_create/fifo_create.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/fifo/fifo_open/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/fifo/fifo_open/fifo_open.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/netinet/msocket_ifnet_remove/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c#1 branch

Differences ...

==== //depot/projects/netsmp/src/sys/alpha/alpha/db_trace.c#3 (text+ko) ====

@@ -42,7 +42,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.24 2005/08/03 04:27:38 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.25 2005/09/10 03:01:23 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -100,11 +100,6 @@
 };
 
 
-int  db_md_set_watchpoint(db_expr_t addr, db_expr_t size);
-int  db_md_clr_watchpoint(db_expr_t addr, db_expr_t size);
-void db_md_list_watchpoints(void);
-
-
 /*
  * Decode the function prologue for the function we're in, and note
  * which registers are stored where, and how large the stack frame is.

==== //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#2 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.178 2005/06/10 03:33:35 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.179 2005/09/03 18:20:18 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1787,12 +1787,12 @@
  * 2. Not wired.
  * 3. Read access.
  * 4. No page table pages.
- * 6. Page IS managed.
  * but is *MUCH* faster than pmap_enter...
  */
 
 vm_page_t
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
+pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    vm_page_t mpte)
 {
 	register pt_entry_t *pte;
 	int managed;

==== //depot/projects/netsmp/src/sys/amd64/amd64/db_trace.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.69 2005/08/27 16:03:39 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.70 2005/09/10 03:01:24 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -202,9 +202,6 @@
 int  amd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access,
 		    struct dbreg * d);
 int  amd64_clr_watch(int watchnum, struct dbreg * d);
-int  db_md_set_watchpoint(db_expr_t addr, db_expr_t size);
-int  db_md_clr_watchpoint(db_expr_t addr, db_expr_t size);
-void db_md_list_watchpoints(void);
 
 /*
  * Figure out how many arguments were passed into the frame at "fp".

==== //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#6 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.526 2005/08/26 05:18:46 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.528 2005/09/04 19:06:26 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1872,6 +1872,7 @@
 	vm_paddr_t opa;
 	pt_entry_t origpte, newpte;
 	vm_page_t mpte, om;
+	boolean_t invlva;
 
 	va = trunc_page(va);
 #ifdef PMAP_DIAGNOSTIC
@@ -1935,14 +1936,6 @@
 		else if (!wired && (origpte & PG_W))
 			pmap->pm_stats.wired_count--;
 
-#if defined(PMAP_DIAGNOSTIC)
-		if (pmap_nw_modified((pt_entry_t) origpte)) {
-			printf(
-	"pmap_enter: modified page not writable: va: 0x%lx, pte: 0x%lx\n",
-			    va, origpte);
-		}
-#endif
-
 		/*
 		 * Remove extra pte reference
 		 */
@@ -2014,17 +2007,30 @@
 	 * to update the pte.
 	 */
 	if ((origpte & ~(PG_M|PG_A)) != newpte) {
-		if (origpte & PG_MANAGED) {
+		if (origpte & PG_V) {
+			invlva = FALSE;
 			origpte = pte_load_store(pte, newpte | PG_A);
-			if ((origpte & PG_M) && pmap_track_modified(va))
-				vm_page_dirty(om);
-			if (origpte & PG_A)
-				vm_page_flag_set(om, PG_REFERENCED);
+			if (origpte & PG_A) {
+				if (origpte & PG_MANAGED)
+					vm_page_flag_set(om, PG_REFERENCED);
+				if (opa != VM_PAGE_TO_PHYS(m) || ((origpte &
+				    PG_NX) == 0 && (newpte & PG_NX)))
+					invlva = TRUE;
+			}
+			if (origpte & PG_M) {
+				KASSERT((origpte & PG_RW),
+				    ("pmap_enter: modified page not writable:"
+				     " va: 0x%lx, pte: 0x%lx", va, origpte));
+				if ((origpte & PG_MANAGED) &&
+				    pmap_track_modified(va))
+					vm_page_dirty(om);
+				if ((newpte & PG_RW) == 0)
+					invlva = TRUE;
+			}
+			if (invlva)
+				pmap_invalidate_page(pmap, va);
 		} else
 			pte_store(pte, newpte | PG_A);
-		if (origpte) {
-			pmap_invalidate_page(pmap, va);
-		}
 	}
 	vm_page_unlock_queues();
 	PMAP_UNLOCK(pmap);
@@ -2036,12 +2042,12 @@
  * 2. Not wired.
  * 3. Read access.
  * 4. No page table pages.
- * 6. Page IS managed.
  * but is *MUCH* faster than pmap_enter...
  */
 
 vm_page_t
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
+pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    vm_page_t mpte)
 {
 	pt_entry_t *pte;
 	vm_paddr_t pa;
@@ -2130,6 +2136,8 @@
 	pmap->pm_stats.resident_count++;
 
 	pa = VM_PAGE_TO_PHYS(m);
+	if ((prot & VM_PROT_EXECUTE) == 0)
+		pa |= pg_nx;
 
 	/*
 	 * Now validate mapping with RO protection

==== //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#3 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.441 2005/07/24 17:55:57 mux Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.442 2005/09/08 03:29:18 scottl Exp $
 
 machine		amd64
 cpu		HAMMER
@@ -130,6 +130,7 @@
 device		arcmsr		# Areca SATA II RAID
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
+device		hptmv		# Highpoint RocketRAID 182x
 device		iir		# Intel Integrated RAID
 device		ips		# IBM (Adaptec) ServeRAID
 device		mly		# Mylex AcceleRAID/eXtremeRAID

==== //depot/projects/netsmp/src/sys/amd64/conf/NOTES#3 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.41 2005/07/22 16:02:40 ru Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.42 2005/09/08 03:29:18 scottl Exp $
 #
 
 #
@@ -278,7 +278,7 @@
 #
 # Highpoint RocketRAID 182x.  This is really just software RAID on a
 # Marvell SATA chip.
-#device		hptmv	# Broken, i386-only binary.
+device		hptmv
 
 #
 # IBM (now Adaptec) ServeRAID controllers

==== //depot/projects/netsmp/src/sys/arm/arm/db_trace.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.11 2005/08/03 04:27:38 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.12 2005/09/10 03:01:24 marcel Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 
@@ -51,9 +51,6 @@
 
 #define INKERNEL(va)	(((vm_offset_t)(va)) >= VM_MIN_KERNEL_ADDRESS)
 
-int  db_md_set_watchpoint(db_expr_t addr, db_expr_t size);
-int  db_md_clr_watchpoint(db_expr_t addr, db_expr_t size);
-void db_md_list_watchpoints(void);
 /*
  * APCS stack frames are awkward beasts, so I don't think even trying to use
  * a structure to represent them is a good idea.

==== //depot/projects/netsmp/src/sys/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.36 2005/06/23 11:37:41 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.37 2005/09/03 18:20:18 alc Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -3536,19 +3536,19 @@
  * 2. Not wired.
  * 3. Read access.
  * 4. No page table pages.
- * 6. Page IS managed.
  * but is *MUCH* faster than pmap_enter...
  */
 
 vm_page_t
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte)
+pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    vm_page_t mpte)
 {
 
 	vm_page_busy(m);
 	vm_page_unlock_queues();
 	VM_OBJECT_UNLOCK(m->object);
 	mtx_lock(&Giant);
-	pmap_enter(pmap, va, m, VM_PROT_READ|VM_PROT_EXECUTE, FALSE);
+	pmap_enter(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
 	pmap_idcache_wbinv_all(pmap);
 	mtx_unlock(&Giant);
 	VM_OBJECT_LOCK(m->object);

==== //depot/projects/netsmp/src/sys/conf/Makefile.amd64#2 (text+ko) ====

@@ -2,7 +2,7 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
 #	from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.16 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.17 2005/09/07 17:38:46 obrien Exp $
 #
 # Makefile for FreeBSD
 #
@@ -32,7 +32,7 @@
 .include "$S/conf/kern.pre.mk"
 
 DDB_ENABLED!=	grep DDB opt_ddb.h || true
-.if ${DDB_ENABLED} != ""
+.if !empty(DDB_ENABLED)
 CFLAGS+=	-fno-omit-frame-pointer
 .endif
 

==== //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#2 (text+ko) ====

@@ -1,7 +1,7 @@
 # Makefile.powerpc -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.277 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.278 2005/09/07 17:38:46 obrien Exp $
 #
 # Makefile for FreeBSD
 #
@@ -33,7 +33,7 @@
 CFLAGS+= -msoft-float
 
 DDB_ENABLED!=	grep DDB opt_ddb.h || true
-.if ${DDB_ENABLED} != ""
+.if !empty(DDB_ENABLED)
 CFLAGS+=	-fno-omit-frame-pointer
 .endif
 

==== //depot/projects/netsmp/src/sys/conf/files#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1042 2005/08/26 12:48:34 takawata Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1047 2005/09/11 03:38:18 obrien Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -111,14 +111,20 @@
 coda/coda_vfsops.c		optional vcoda
 coda/coda_vnops.c		optional vcoda
 compat/linprocfs/linprocfs.c	optional linprocfs
-contrib/altq/altq/altq_cbq.c	optional altq
+contrib/altq/altq/altq_cbq.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
 contrib/altq/altq/altq_cdnr.c	optional altq
-contrib/altq/altq/altq_hfsc.c	optional altq
-contrib/altq/altq/altq_priq.c	optional altq
-contrib/altq/altq/altq_red.c	optional altq
-contrib/altq/altq/altq_rio.c	optional altq
+contrib/altq/altq/altq_hfsc.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_priq.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_red.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_rio.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
 contrib/altq/altq/altq_rmclass.c optional altq
-contrib/altq/altq/altq_subr.c	optional altq
+contrib/altq/altq/altq_subr.c	optional altq \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
 contrib/dev/acpica/dbcmds.c	optional acpi acpi_debug
 contrib/dev/acpica/dbdisply.c	optional acpi acpi_debug
 contrib/dev/acpica/dbexec.c	optional acpi acpi_debug
@@ -240,51 +246,96 @@
 contrib/dev/acpica/utmisc.c	optional acpi
 contrib/dev/acpica/utobject.c	optional acpi
 contrib/dev/acpica/utxface.c	optional acpi
-contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal
-contrib/ipfilter/netinet/fil.c	optional ipfilter inet
-contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_log.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_state.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet
-contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet
-contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm
-contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase
-contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase
-contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu
-contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop
-contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni
-contrib/pf/net/if_pflog.c	optional pflog
-contrib/pf/net/if_pfsync.c	optional pfsync
-contrib/pf/net/pf.c		optional pf
-contrib/pf/net/pf_if.c		optional pf
-contrib/pf/net/pf_subr.c	optional pf
-contrib/pf/net/pf_ioctl.c	optional pf
-contrib/pf/net/pf_norm.c	optional pf
-contrib/pf/net/pf_table.c	optional pf
-contrib/pf/net/pf_osfp.c	optional pf
+contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal \
+	compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
+contrib/ipfilter/netinet/fil.c	optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_log.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \
+	compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/pf/net/if_pflog.c	optional pflog \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/if_pfsync.c	optional pfsync \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf.c		optional pf \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_if.c		optional pf \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_subr.c	optional pf \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_ioctl.c	optional pf \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_norm.c	optional pf \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_table.c	optional pf \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_osfp.c	optional pf \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
 contrib/pf/netinet/in4_cksum.c	optional pf inet
 crypto/blowfish/bf_ecb.c	optional ipsec ipsec_esp
 crypto/blowfish/bf_skey.c	optional crypto
@@ -430,10 +481,13 @@
 dev/ata/atapi-fd.c		optional atapifd
 dev/ata/atapi-tape.c		optional atapist
 dev/ath/ath_rate/amrr/amrr.c 	optional ath_rate_amrr
-dev/ath/ath_rate/onoe/onoe.c 	optional ath_rate_onoe
+dev/ath/ath_rate/onoe/onoe.c 	optional ath_rate_onoe \
+	compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
 dev/ath/ath_rate/sample/sample.c 	optional ath_rate_sample
-dev/ath/if_ath.c		optional ath
-dev/ath/if_ath_pci.c		optional ath pci
+dev/ath/if_ath.c		optional ath \
+	compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
+dev/ath/if_ath_pci.c		optional ath pci \
+	compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
 dev/awi/am79c930.c		optional awi
 dev/awi/awi.c			optional awi
 dev/awi/if_awi_pccard.c		optional awi pccard
@@ -859,11 +913,16 @@
 dev/syscons/warp/warp_saver.c	optional warp_saver
 dev/tdfx/tdfx_pci.c		optional tdfx pci
 dev/trm/trm.c			optional trm
-dev/twa/tw_cl_fwimg.c		optional twa
-dev/twa/tw_cl_init.c		optional twa
-dev/twa/tw_cl_intr.c		optional twa
-dev/twa/tw_cl_io.c		optional twa
-dev/twa/tw_cl_misc.c		optional twa
+dev/twa/tw_cl_fwimg.c		optional twa \
+	compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_cl_init.c		optional twa \
+	compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_cl_intr.c		optional twa \
+	compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_cl_io.c		optional twa \
+	compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_cl_misc.c		optional twa \
+	compile-with "${NORMAL_C} -I$S/dev/twa"
 dev/twa/tw_osl_cam.c		optional twa
 dev/twa/tw_osl_freebsd.c	optional twa
 dev/twe/twe.c			optional twe
@@ -1506,12 +1565,17 @@
 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/ccatm/ng_ccatm.c	optional ngatm_ccatm
+netgraph/atm/ccatm/ng_ccatm.c	optional ngatm_ccatm \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/atm/ng_atm.c		optional ngatm_atm
-netgraph/atm/ngatmbase.c		optional ngatm_atmbase
-netgraph/atm/sscfu/ng_sscfu.c	optional ngatm_sscfu
-netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop
-netgraph/atm/uni/ng_uni.c	optional ngatm_uni
+netgraph/atm/ngatmbase.c	optional ngatm_atmbase \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+netgraph/atm/sscfu/ng_sscfu.c	optional ngatm_sscfu \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+netgraph/atm/uni/ng_uni.c	optional ngatm_uni \
+	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth
 netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c
 netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4
@@ -1584,7 +1648,8 @@
 netinet/ip_gre.c		optional gre inet
 netinet/ip_id.c			optional inet
 netinet/in_pcb.c		optional inet
-netinet/in_proto.c		optional inet
+netinet/in_proto.c		optional inet \
+	compile-with "${NORMAL_C} -I$S/contrib/pf"
 netinet/in_rmx.c		optional inet
 netinet/ip_divert.c		optional ipdivert
 netinet/ip_dummynet.c		optional dummynet

==== //depot/projects/netsmp/src/sys/conf/files.amd64#3 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.75 2005/07/21 21:57:31 peter Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.76 2005/09/08 03:29:18 scottl Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -68,6 +68,11 @@
 	no-implicit-rule no-obj before-depend				\
 	clean		"os+%DIKED-nve.h"
 #
+hptmvraid.o			optional	hptmv			\
+	dependency	"$S/dev/hptmv/amd64-elf.raid.o.uu"	\
+	compile-with	"uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
+	no-implicit-rule
+#
 amd64/acpica/OsdEnvironment.c	optional	acpi
 amd64/acpica/acpi_machdep.c	optional	acpi
 amd64/acpica/acpi_wakeup.c	optional	acpi
@@ -157,6 +162,11 @@
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
 dev/fdc/fdc_pccard.c		optional	fdc pccard
+dev/hptmv/entry.c		optional	hptmv
+dev/hptmv/mv.c			optional	hptmv
+dev/hptmv/gui_lib.c		optional	hptmv
+dev/hptmv/hptproc.c		optional	hptmv
+dev/hptmv/ioctl.c		optional	hptmv
 dev/hwpmc/hwpmc_amd.c		optional	hwpmc
 dev/hwpmc/hwpmc_piv.c		optional	hwpmc
 dev/hwpmc/hwpmc_x86.c		optional	hwpmc

==== //depot/projects/netsmp/src/sys/conf/files.ia64#2 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.ia64,v 1.81 2005/06/30 07:49:21 peter Exp $
+# $FreeBSD: src/sys/conf/files.ia64,v 1.83 2005/09/10 03:18:51 marcel Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -91,14 +91,12 @@
 ia64/disasm/disasm_format.c	standard
 ia64/ia32/ia32_reg.c		optional	compat_ia32
 ia64/ia32/ia32_signal.c		optional	compat_ia32
-ia64/ia32/ia32_sigtramp.c	optional        compat_ia32
 ia64/ia32/ia32_trap.c		optional	compat_ia32
 ia64/ia64/autoconf.c		standard
 ia64/ia64/busdma_machdep.c	standard
 ia64/ia64/clock.c		standard
 ia64/ia64/context.S		standard
-ia64/ia64/db_interface.c	optional	ddb
-ia64/ia64/db_trace.c		optional	ddb
+ia64/ia64/db_machdep.c		optional	ddb
 ia64/ia64/dump_machdep.c	standard
 ia64/ia64/efi.c			standard
 ia64/ia64/elf_machdep.c		standard

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

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.83 2005/06/09 05:38:18 imp Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.84 2005/09/11 00:22:21 obrien Exp $
 
 # Part of a unified Makefile for building kernels.  This part includes all
 # the definitions that need to be after all the % directives except %RULES
@@ -63,12 +63,7 @@
 .endif
 .endif
 
-.if !defined(DEBUG)
-FULLKERNEL=	${KERNEL_KO}
-.else
-FULLKERNEL=	${KERNEL_KO}.debug
-${KERNEL_KO}: ${FULLKERNEL}
-	${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
+.if defined(DEBUG)
 install.debug reinstall.debug: gdbinit
 	cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG ${.TARGET:R}
 
@@ -83,7 +78,7 @@
 .endif
 .endif
 
-${FULLKERNEL}: ${SYSTEM_DEP} vers.o
+${KERNEL_KO}: ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
@@ -109,7 +104,7 @@
 
 kernel-clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs \
-	    ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags vers.c \
+	    ${KERNEL_KO} linterrs makelinks tags vers.c \
 	    vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \
 	    ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
 	    ${CLEAN}
@@ -186,7 +181,7 @@
 .endif
 
 kernel-install:
-	@if [ ! -f ${FULLKERNEL} ] ; then \
+	@if [ ! -f ${KERNEL_KO} ] ; then \
 		echo "You must build a kernel first." ; \
 		exit 1 ; \
 	fi
@@ -205,19 +200,11 @@
 	fi
 .endif
 	mkdir -p ${DESTDIR}${KODIR}
-.if defined(DEBUG) && defined(INSTALL_DEBUG)
-	${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
-.else
 	${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
-.endif
 
 kernel-reinstall:
 	@-chflags -R noschg ${DESTDIR}${KODIR}
-.if defined(DEBUG) && defined(INSTALL_DEBUG)
-	${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
-.else
 	${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
-.endif
 
 config.o env.o hints.o vers.o vnode_if.o:
 	${NORMAL_C}

==== //depot/projects/netsmp/src/sys/conf/kern.pre.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.65 2005/04/13 14:49:57 imp Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.71 2005/09/11 07:33:43 obrien Exp $
 
 # Part of a unified Makefile for building kernels.  This part contains all
 # of the definitions that need to be before %BEFORE_DEPEND.
@@ -55,6 +55,14 @@
 # ... and the same for altq
 INCLUDES+= -I$S/contrib/altq
 
+# ... and the same for Atheros HAL when the author builds it from
+#     non-distributable sources.
+.if defined(ATH_BUILDING_FROM_SOURCE)
+INCLUDES+= -I$S/contrib/dev/ath
+.endif
+
+.if make(depend) || make(kernel-depend)
+
 # ... and the same for ipfilter
 INCLUDES+= -I$S/contrib/ipfilter
 
@@ -62,7 +70,7 @@
 INCLUDES+= -I$S/contrib/pf
 
 # ... and the same for Atheros HAL
-INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
+INCLUDES+= -I$S/contrib/dev/ath/freebsd
 
 # ... and the same for the NgATM stuff
 INCLUDES+= -I$S/contrib/ngatm
@@ -70,6 +78,8 @@
 # .. and the same for twa
 INCLUDES+= -I$S/dev/twa
 
+.endif
+
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG}
 CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h
 .if ${CC} != "icc"

==== //depot/projects/netsmp/src/sys/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.192 2005/04/22 17:39:58 ru Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.193 2005/09/07 17:38:46 obrien Exp $
 #
 # The include file <bsd.kmod.mk> handles building and installing loadable
 # kernel modules.
@@ -331,7 +331,7 @@
 .endfor # _ext
 .endfor # _srcsrc
 
-.if ${SRCS:Mvnode_if.c} != ""
+.if !empty(SRCS:Mvnode_if.c)
 CLEANFILES+=	vnode_if.c
 .if !exists(@)
 vnode_if.c: @
@@ -341,7 +341,7 @@
 	${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -c
 .endif
 
-.if ${SRCS:Mvnode_if.h} != ""
+.if !empty(SRCS:Mvnode_if.h)
 CLEANFILES+=	vnode_if.h vnode_if_newproto.h vnode_if_typedef.h
 .if !exists(@)
 vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: @
@@ -358,7 +358,7 @@
 .endif
 
 .for _i in mii pccard
-.if ${SRCS:M${_i}devs.h} != ""
+.if !empty(SRCS:M${_i}devs.h)
 CLEANFILES+=	${_i}devs.h
 .if !exists(@)
 ${_i}devs.h: @
@@ -369,7 +369,7 @@
 .endif
 .endfor # _i
 
-.if ${SRCS:Musbdevs.h} != ""
+.if !empty(SRCS:Musbdevs.h)
 CLEANFILES+=	usbdevs.h
 .if !exists(@)
 usbdevs.h: @
@@ -379,7 +379,7 @@
 	${AWK} -f @/tools/usbdevs2h.awk @/dev/usb/usbdevs -h
 .endif
 
-.if ${SRCS:Musbdevs_data.h} != ""
+.if !empty(SRCS:Musbdevs_data.h)
 CLEANFILES+=	usbdevs_data.h
 .if !exists(@)
 usbdevs_data.h: @
@@ -389,7 +389,7 @@
 	${AWK} -f @/tools/usbdevs2h.awk @/dev/usb/usbdevs -d
 .endif
 
-.if ${SRCS:Macpi_quirks.h} != ""
+.if !empty(SRCS:Macpi_quirks.h)
 CLEANFILES+=	acpi_quirks.h
 .if !exists(@)
 acpi_quirks.h: @

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

More information about the p4-projects mailing list