Open Issues

# This data is by no means authoritative; if you think you know better,
@@ -236,7 +236,46 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s
 # unless discontinued, next DST may end Thursday 28 August 2008.
 # From Paul Eggert (2007-08-17):
 # For lack of better info, assume the new rule is last Thursday in August.
-Rule	Egypt	2008	max	-	Aug	lastThu	23:00s	0	-
+
+# From Petr Machata (2009-04-06):
+# The following appeared in Red Hat bugzilla[1] (edited):
+#
+# > $ zdump -v /usr/share/zoneinfo/Africa/Cairo | grep 2009
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 21:59:59 2009 UTC =3D Thu =
+# Apr 23
+# > 23:59:59 2009 EET isdst=3D0 gmtoff=3D7200
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 22:00:00 2009 UTC =3D Fri =
+# Apr 24
+# > 01:00:00 2009 EEST isdst=3D1 gmtoff=3D10800
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 20:59:59 2009 UTC =3D Thu =
+# Aug 27
+# > 23:59:59 2009 EEST isdst=3D1 gmtoff=3D10800
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 21:00:00 2009 UTC =3D Thu =
+# Aug 27
+# > 23:00:00 2009 EET isdst=3D0 gmtoff=3D7200
+#
+# > end date should be Thu Sep 24 2009 (Last Thursday in September at 23:59=
+# :59)
+# > http://support.microsoft.com/kb/958729/
+#
+# timeanddate[2] and another site I've found[3] also support that.
+#
+# [1] 
+# https://bugzilla.redhat.com/show_bug.cgi?id=3D492263
+# 
+# [2] 
+# http://www.timeanddate.com/worldclock/clockchange.html?n=3D53
+# 
+# [3] 
+# http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+# 
+
+# From Arthur David Olson (2009-04-20):
+# In 2009 (and for the next several years), Ramadan ends before the fourth
+# Thursday in September; Egypt is expected to revert to the last Thursday
+# in September.
+Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
+Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
From kib at FreeBSD.org  Tue May  5 09:08:38 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Tue May  5 09:08:49 2009
Subject: svn commit: r191809 - in stable/7/sys: . amd64/amd64 arm/arm
	contrib/pf dev/ath/ath_hal dev/cxgb i386/i386 ia64/ia64
Message-ID: <200905050908.n4598bHc072718@svn.freebsd.org>

Author: kib
Date: Tue May  5 09:08:37 2009
New Revision: 191809
URL: http://svn.freebsd.org/changeset/base/191809

Log:
  MFC r191011:
  The bus_dmamap_load_uio(9) shall use pmap of the thread recorded in the
  uio_td to extract pages from, instead of unconditionally use kernel
  pmap.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/busdma_machdep.c
  stable/7/sys/arm/arm/busdma_machdep.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/i386/busdma_machdep.c
  stable/7/sys/ia64/ia64/busdma_machdep.c

Modified: stable/7/sys/amd64/amd64/busdma_machdep.c
==============================================================================

--- stable/7/sys/amd64/amd64/busdma_machdep.c	Tue May  5 08:30:38 2009	(r191808)
+++ stable/7/sys/amd64/amd64/busdma_machdep.c	Tue May  5 09:08:37 2009	(r191809)
@@ -602,7 +602,10 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			paddr = pmap_kextract(vaddr);
+			if (pmap)
+				paddr = pmap_extract(pmap, vaddr);
+			else
+				paddr = pmap_kextract(vaddr);
 			if (run_filter(dmat, paddr) != 0)
 				map->pagesneeded++;
 			vaddr += PAGE_SIZE;

Modified: stable/7/sys/arm/arm/busdma_machdep.c
==============================================================================
--- stable/7/sys/arm/arm/busdma_machdep.c	Tue May  5 08:30:38 2009	(r191808)
+++ stable/7/sys/arm/arm/busdma_machdep.c	Tue May  5 09:08:37 2009	(r191809)
@@ -663,8 +663,8 @@ bus_dmamem_free(bus_dma_tag_t dmat, void
 }
 
 static int
-_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
-			bus_size_t buflen, int flags)
+_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
+    void *buf, bus_size_t buflen, int flags)
 {
 	vm_offset_t vaddr;
 	vm_offset_t vendaddr;
@@ -683,7 +683,10 @@ _bus_dmamap_count_pages(bus_dma_tag_t dm
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			paddr = pmap_kextract(vaddr);
+			if (pmap != NULL)
+				paddr = pmap_extract(pmap, vaddr);
+			else
+				paddr = pmap_kextract(vaddr);
 			if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
 			    run_filter(dmat, paddr) != 0)
 				map->pagesneeded++;
@@ -739,7 +742,8 @@ bus_dmamap_load_buffer(bus_dma_tag_t dma
 	bmask = ~(dmat->boundary - 1);
 
 	if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
-		error = _bus_dmamap_count_pages(dmat, map, buf, buflen, flags);
+		error = _bus_dmamap_count_pages(dmat, map, pmap, buf, buflen,
+		    flags);
 		if (error)
 			return (error);
 	}

Modified: stable/7/sys/i386/i386/busdma_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/busdma_machdep.c	Tue May  5 08:30:38 2009	(r191808)
+++ stable/7/sys/i386/i386/busdma_machdep.c	Tue May  5 09:08:37 2009	(r191809)
@@ -141,8 +141,8 @@ static bus_addr_t add_bounce_page(bus_dm
 				   vm_offset_t vaddr, bus_size_t size);
 static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage);
 int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr);
-int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
-			    bus_size_t buflen, int flags);
+int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
+    void *buf, bus_size_t buflen, int flags);
 
 /*
  * Return true if a match is made.
@@ -568,8 +568,8 @@ bus_dmamem_free(bus_dma_tag_t dmat, void
 }
 
 int
-_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
-			bus_size_t buflen, int flags)
+_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
+    void *buf, bus_size_t buflen, int flags)
 {
 	vm_offset_t vaddr;
 	vm_offset_t vendaddr;
@@ -589,7 +589,10 @@ _bus_dmamap_count_pages(bus_dma_tag_t dm
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			paddr = pmap_kextract(vaddr);
+			if (pmap)
+				paddr = pmap_extract(pmap, vaddr);
+			else
+				paddr = pmap_kextract(vaddr);
 			if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
 			    run_filter(dmat, paddr) != 0) {
 				map->pagesneeded++;
@@ -651,7 +654,7 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
 		map = &nobounce_dmamap;
 
 	if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
-		error = _bus_dmamap_count_pages(dmat, map, buf, buflen, flags);
+		error = _bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, flags);
 		if (error)
 			return (error);
 	}

Modified: stable/7/sys/ia64/ia64/busdma_machdep.c
==============================================================================
--- stable/7/sys/ia64/ia64/busdma_machdep.c	Tue May  5 08:30:38 2009	(r191808)
+++ stable/7/sys/ia64/ia64/busdma_machdep.c	Tue May  5 09:08:37 2009	(r191809)
@@ -527,7 +527,10 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dm
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			paddr = pmap_kextract(vaddr);
+			if (pmap != NULL)
+				paddr = pmap_extract(pmap, vaddr);
+			else
+				paddr = pmap_kextract(vaddr);
 			if (run_filter(dmat, paddr, 0) != 0)
 				map->pagesneeded++;
 			vaddr += PAGE_SIZE;
From kib at FreeBSD.org  Tue May  5 09:16:58 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Tue May  5 09:17:14 2009
Subject: svn commit: r191810 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb vm
Message-ID: <200905050916.n459GvbI072939@svn.freebsd.org>

Author: kib
Date: Tue May  5 09:16:57 2009
New Revision: 191810
URL: http://svn.freebsd.org/changeset/base/191810

Log:
  MFC r190886:
  When vm_map_wire(9) is allowed to skip holes in the wired region, skip
  the mappings without any of read and execution rights, in particular,
  the PROT_NONE entries. This makes mlockall(2) work for the process
  address space that has such mappings.
  
  Since protection mode of the entry may change between setting
  MAP_ENTRY_IN_TRANSITION and final pass over the region that records
  the wire status of the entries, allocate new map entry flag
  MAP_ENTRY_WIRE_SKIPPED to mark the skipped PROT_NONE entries.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/vm/vm_map.c
  stable/7/sys/vm/vm_map.h

Modified: stable/7/sys/vm/vm_map.c
==============================================================================
--- stable/7/sys/vm/vm_map.c	Tue May  5 09:08:37 2009	(r191809)
+++ stable/7/sys/vm/vm_map.c	Tue May  5 09:16:57 2009	(r191810)
@@ -2059,6 +2059,16 @@ vm_map_wire(vm_map_t map, vm_offset_t st
 		 *
 		 */
 		if (entry->wired_count == 0) {
+			if ((entry->protection & (VM_PROT_READ|VM_PROT_EXECUTE))
+			    == 0) {
+				if ((flags & VM_MAP_WIRE_HOLESOK) == 0) {
+					end = entry->end;
+					rv = KERN_INVALID_ADDRESS;
+					goto done;
+				}
+				entry->eflags |= MAP_ENTRY_WIRE_SKIPPED;
+				goto next_entry;
+			}
 			entry->wired_count++;
 			saved_start = entry->start;
 			saved_end = entry->end;
@@ -2116,6 +2126,7 @@ vm_map_wire(vm_map_t map, vm_offset_t st
 		 * Check the map for holes in the specified region.
 		 * If VM_MAP_WIRE_HOLESOK was specified, skip this check.
 		 */
+	next_entry:
 		if (((flags & VM_MAP_WIRE_HOLESOK) == 0) &&
 		    (entry->end < end && (entry->next == &map->header ||
 		    entry->next->start > entry->end))) {
@@ -2137,6 +2148,8 @@ done:
 	}
 	entry = first_entry;
 	while (entry != &map->header && entry->start < end) {
+		if ((entry->eflags & MAP_ENTRY_WIRE_SKIPPED) != 0)
+			goto next_entry_done;
 		if (rv == KERN_SUCCESS) {
 			if (user_wire)
 				entry->eflags |= MAP_ENTRY_USER_WIRED;
@@ -2159,9 +2172,10 @@ done:
 				    entry->object.vm_object->type == OBJT_DEVICE);
 			}
 		}
+	next_entry_done:
 		KASSERT(entry->eflags & MAP_ENTRY_IN_TRANSITION,
 			("vm_map_wire: in-transition flag missing"));
-		entry->eflags &= ~MAP_ENTRY_IN_TRANSITION;
+		entry->eflags &= ~(MAP_ENTRY_IN_TRANSITION|MAP_ENTRY_WIRE_SKIPPED);
 		if (entry->eflags & MAP_ENTRY_NEEDS_WAKEUP) {
 			entry->eflags &= ~MAP_ENTRY_NEEDS_WAKEUP;
 			need_wakeup = TRUE;

Modified: stable/7/sys/vm/vm_map.h
==============================================================================
--- stable/7/sys/vm/vm_map.h	Tue May  5 09:08:37 2009	(r191809)
+++ stable/7/sys/vm/vm_map.h	Tue May  5 09:16:57 2009	(r191810)
@@ -138,6 +138,8 @@ struct vm_map_entry {
 #define	MAP_ENTRY_GROWS_DOWN		0x1000	/* Top-down stacks */
 #define	MAP_ENTRY_GROWS_UP		0x2000	/* Bottom-up stacks */
 
+#define	MAP_ENTRY_WIRE_SKIPPED		0x4000
+
 #ifdef	_KERNEL
 static __inline u_char
 vm_map_entry_behavior(vm_map_entry_t entry)
From kib at FreeBSD.org  Tue May  5 09:20:09 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Tue May  5 09:20:16 2009
Subject: svn commit: r191811 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb ufs/ffs
Message-ID: <200905050920.n459K7Tg073052@svn.freebsd.org>

Author: kib
Date: Tue May  5 09:20:07 2009
New Revision: 191811
URL: http://svn.freebsd.org/changeset/base/191811

Log:
  MFC r190690:
  When removing or renaming snaphost, do not delve into request_cleanup().
  The later may need blocks from the underlying device that belongs
  to normal files, that should not be locked while snap lock is held.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/ufs/ffs/ffs_softdep.c

Modified: stable/7/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- stable/7/sys/ufs/ffs/ffs_softdep.c	Tue May  5 09:16:57 2009	(r191810)
+++ stable/7/sys/ufs/ffs/ffs_softdep.c	Tue May  5 09:20:07 2009	(r191811)
@@ -3315,7 +3315,7 @@ newdirrem(bp, dp, ip, isrmdir, prevdirre
 	 * the number of freefile and freeblks structures.
 	 */
 	ACQUIRE_LOCK(&lk);
-	if (num_dirrem > max_softdeps / 2)
+	if (!(ip->i_flags & SF_SNAPSHOT) && num_dirrem > max_softdeps / 2)
 		(void) request_cleanup(ITOV(dp)->v_mount, FLUSH_REMOVE);
 	num_dirrem += 1;
 	FREE_LOCK(&lk);
From kib at FreeBSD.org  Tue May  5 09:24:21 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Tue May  5 09:24:37 2009
Subject: svn commit: r191812 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905050924.n459OK2f073193@svn.freebsd.org>

Author: kib
Date: Tue May  5 09:24:20 2009
New Revision: 191812
URL: http://svn.freebsd.org/changeset/base/191812

Log:
  MFC r191313:
  On the exit of the child process which parent either set SA_NOCLDWAIT
  or ignored SIGCHLD, unconditionally wake up the parent instead of doing
  this only when the child is a last child.
  
  MFC r191319:
  Fix typo.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_exit.c

Modified: stable/7/sys/kern/kern_exit.c
==============================================================================
--- stable/7/sys/kern/kern_exit.c	Tue May  5 09:20:07 2009	(r191811)
+++ stable/7/sys/kern/kern_exit.c	Tue May  5 09:24:20 2009	(r191812)
@@ -511,13 +511,13 @@ retry:
 		proc_reparent(p, initproc);
 		p->p_sigparent = SIGCHLD;
 		PROC_LOCK(p->p_pptr);
+
 		/*
-		 * If this was the last child of our parent, notify
-		 * parent, so in case he was wait(2)ing, he will
+		 * Notify parent, so in case he was wait(2)ing or
+		 * executing waitpid(2) with our pid, he will
 		 * continue.
 		 */
-		if (LIST_EMPTY(&pp->p_children))
-			wakeup(pp);
+		wakeup(pp);
 	} else
 		mtx_unlock(&p->p_pptr->p_sigacts->ps_mtx);
 
From kib at FreeBSD.org  Tue May  5 10:34:44 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Tue May  5 10:34:57 2009
Subject: svn commit: r191813 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb gnu/fs/xfs/FreeBSD kern sys ufs/ffs
Message-ID: <200905051034.n45AYild074736@svn.freebsd.org>

Author: kib
Date: Tue May  5 10:34:43 2009
New Revision: 191813
URL: http://svn.freebsd.org/changeset/base/191813

Log:
  MFC r189878:
  Fix two issues with bufdaemon, often causing the processes to hang in
  the "nbufkv" sleep.
  
  Do not retry request for the new block from ffs_bufwrite() when write is done
  from bufdaemon and there is a buffer shortage.
  
  In getnewbuf(), help bufdaemon to flush dirty buffers owned by the vnode
  locked by curthread.
  
  For MFC, default value for sysctl vfs.flushbufqtarget is set to -1,
  disabling the helpers. The TDP_BUFNEED flag value from HEAD conflicts
  with TDP_UPCALLING KSE bit, so it is moved to the end of allocated bits.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
  stable/7/sys/kern/vfs_bio.c
  stable/7/sys/sys/buf.h
  stable/7/sys/sys/proc.h
  stable/7/sys/ufs/ffs/ffs_vfsops.c

Modified: stable/7/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
==============================================================================
--- stable/7/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c	Tue May  5 09:24:20 2009	(r191812)
+++ stable/7/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c	Tue May  5 10:34:43 2009	(r191813)
@@ -81,7 +81,7 @@ xfs_buf_get_empty(size_t size,  xfs_buft
 {
 	struct buf *bp;
 
-	bp = geteblk(0);
+	bp = geteblk(0, 0);
 	if (bp != NULL) {
 		bp->b_bufsize = size;
 		bp->b_bcount = size;
@@ -101,7 +101,7 @@ xfs_buf_get_noaddr(size_t len, xfs_bufta
 	if (len >= MAXPHYS)
 		return (NULL);
 
-	bp = geteblk(len);
+	bp = geteblk(len, 0);
 	if (bp != NULL) {
 		KASSERT(BUF_REFCNT(bp) == 1,
 			("xfs_buf_get_empty: bp %p not locked",bp));

Modified: stable/7/sys/kern/vfs_bio.c
==============================================================================
--- stable/7/sys/kern/vfs_bio.c	Tue May  5 09:24:20 2009	(r191812)
+++ stable/7/sys/kern/vfs_bio.c	Tue May  5 10:34:43 2009	(r191813)
@@ -105,7 +105,8 @@ static void vfs_setdirty_locked_object(s
 static void vfs_vmio_release(struct buf *bp);
 static int vfs_bio_clcheck(struct vnode *vp, int size,
 		daddr_t lblkno, daddr_t blkno);
-static int flushbufqueues(int, int);
+static int buf_do_flush(struct vnode *vp);
+static int flushbufqueues(struct vnode *, int, int);
 static void buf_daemon(void);
 static void bremfreel(struct buf *bp);
 
@@ -187,6 +188,9 @@ SYSCTL_INT(_vfs, OID_AUTO, getnewbufcall
 static int getnewbufrestarts;
 SYSCTL_INT(_vfs, OID_AUTO, getnewbufrestarts, CTLFLAG_RW, &getnewbufrestarts, 0,
     "Number of times getnewbuf has had to restart a buffer aquisition");
+static int flushbufqtarget = -1;
+SYSCTL_INT(_vfs, OID_AUTO, flushbufqtarget, CTLFLAG_RW, &flushbufqtarget, 0,
+    "Amount of work to do in flushbufqueues when helping bufdaemon");
 
 /*
  * Wakeup point for bufdaemon, as well as indicator of whether it is already
@@ -258,6 +262,7 @@ static struct mtx bpinlock;
 #define QUEUE_DIRTY_GIANT 3	/* B_DELWRI buffers that need giant */
 #define QUEUE_EMPTYKVA	4	/* empty buffer headers w/KVA assignment */
 #define QUEUE_EMPTY	5	/* empty buffer headers */
+#define QUEUE_SENTINEL	1024	/* not an queue index, but mark for sentinel */
 
 /* Queues for free buffers with various properties */
 static TAILQ_HEAD(bqueues, buf) bufqueues[BUFFER_QUEUES] = { { 0 } };
@@ -1707,21 +1712,23 @@ vfs_bio_awrite(struct buf *bp)
  */
 
 static struct buf *
-getnewbuf(int slpflag, int slptimeo, int size, int maxsize)
+getnewbuf(struct vnode *vp, int slpflag, int slptimeo, int size, int maxsize,
+    int gbflags)
 {
+	struct thread *td;
 	struct buf *bp;
 	struct buf *nbp;
 	int defrag = 0;
 	int nqindex;
 	static int flushingbufs;
 
+	td = curthread;
 	/*
 	 * We can't afford to block since we might be holding a vnode lock,
 	 * which may prevent system daemons from running.  We deal with
 	 * low-memory situations by proactively returning memory and running
 	 * async I/O rather then sync I/O.
 	 */
-
 	atomic_add_int(&getnewbufcalls, 1);
 	atomic_subtract_int(&getnewbufrestarts, 1);
 restart:
@@ -1953,8 +1960,9 @@ restart:
 	 */
 
 	if (bp == NULL) {
-		int flags;
+		int flags, norunbuf;
 		char *waitmsg;
+		int fl;
 
 		if (defrag) {
 			flags = VFS_BIO_NEED_BUFSPACE;
@@ -1972,9 +1980,35 @@ restart:
 		mtx_unlock(&bqlock);
 
 		bd_speedup();	/* heeeelp */
+		if (gbflags & GB_NOWAIT_BD)
+			return (NULL);
 
 		mtx_lock(&nblock);
 		while (needsbuffer & flags) {
+			if (vp != NULL && (td->td_pflags & TDP_BUFNEED) == 0) {
+				mtx_unlock(&nblock);
+				/*
+				 * getblk() is called with a vnode
+				 * locked, and some majority of the
+				 * dirty buffers may as well belong to
+				 * the vnode. Flushing the buffers
+				 * there would make a progress that
+				 * cannot be achieved by the
+				 * buf_daemon, that cannot lock the
+				 * vnode.
+				 */
+				norunbuf = ~(TDP_BUFNEED | TDP_NORUNNINGBUF) |
+				    (td->td_pflags & TDP_NORUNNINGBUF);
+				/* play bufdaemon */
+				td->td_pflags |= TDP_BUFNEED | TDP_NORUNNINGBUF;
+				fl = buf_do_flush(vp);
+				td->td_pflags &= norunbuf;
+				mtx_lock(&nblock);
+				if (fl != 0)
+					continue;
+				if ((needsbuffer & flags) == 0)
+					break;
+			}
 			if (msleep(&needsbuffer, &nblock,
 			    (PRIBIO + 4) | slpflag, waitmsg, slptimeo)) {
 				mtx_unlock(&nblock);
@@ -2043,6 +2077,35 @@ static struct kproc_desc buf_kp = {
 };
 SYSINIT(bufdaemon, SI_SUB_KTHREAD_BUF, SI_ORDER_FIRST, kproc_start, &buf_kp);
 
+static int
+buf_do_flush(struct vnode *vp)
+{
+	int flushed;
+
+	flushed = flushbufqueues(vp, QUEUE_DIRTY, 0);
+	/* The list empty check here is slightly racy */
+	if (!TAILQ_EMPTY(&bufqueues[QUEUE_DIRTY_GIANT])) {
+		mtx_lock(&Giant);
+		flushed += flushbufqueues(vp, QUEUE_DIRTY_GIANT, 0);
+		mtx_unlock(&Giant);
+	}
+	if (flushed == 0) {
+		/*
+		 * Could not find any buffers without rollback
+		 * dependencies, so just write the first one
+		 * in the hopes of eventually making progress.
+		 */
+		flushbufqueues(vp, QUEUE_DIRTY, 1);
+		if (!TAILQ_EMPTY(
+			    &bufqueues[QUEUE_DIRTY_GIANT])) {
+			mtx_lock(&Giant);
+			flushbufqueues(vp, QUEUE_DIRTY_GIANT, 1);
+			mtx_unlock(&Giant);
+		}
+	}
+	return (flushed);
+}
+
 static void
 buf_daemon()
 {
@@ -2056,7 +2119,7 @@ buf_daemon()
 	/*
 	 * This process is allowed to take the buffer cache to the limit
 	 */
-	curthread->td_pflags |= TDP_NORUNNINGBUF;
+	curthread->td_pflags |= TDP_NORUNNINGBUF | TDP_BUFNEED;
 	mtx_lock(&bdlock);
 	for (;;) {
 		bd_request = 0;
@@ -2071,30 +2134,8 @@ buf_daemon()
 		 * normally would so they can run in parallel with our drain.
 		 */
 		while (numdirtybuffers > lodirtybuffers) {
-			int flushed;
-
-			flushed = flushbufqueues(QUEUE_DIRTY, 0);
-			/* The list empty check here is slightly racy */
-			if (!TAILQ_EMPTY(&bufqueues[QUEUE_DIRTY_GIANT])) {
-				mtx_lock(&Giant);
-				flushed += flushbufqueues(QUEUE_DIRTY_GIANT, 0);
-				mtx_unlock(&Giant);
-			}
-			if (flushed == 0) {
-				/*
-				 * Could not find any buffers without rollback
-				 * dependencies, so just write the first one
-				 * in the hopes of eventually making progress.
-				 */
-				flushbufqueues(QUEUE_DIRTY, 1);
-				if (!TAILQ_EMPTY(
-				    &bufqueues[QUEUE_DIRTY_GIANT])) {
-					mtx_lock(&Giant);
-					flushbufqueues(QUEUE_DIRTY_GIANT, 1);
-					mtx_unlock(&Giant);
-				}
+			if (buf_do_flush(NULL) == 0)
 				break;
-			}
 			uio_yield();
 		}
 
@@ -2140,7 +2181,7 @@ SYSCTL_INT(_vfs, OID_AUTO, flushwithdeps
     0, "Number of buffers flushed with dependecies that require rollbacks");
 
 static int
-flushbufqueues(int queue, int flushdeps)
+flushbufqueues(struct vnode *lvp, int queue, int flushdeps)
 {
 	struct thread *td = curthread;
 	struct buf sentinel;
@@ -2151,20 +2192,37 @@ flushbufqueues(int queue, int flushdeps)
 	int flushed;
 	int target;
 
-	target = numdirtybuffers - lodirtybuffers;
-	if (flushdeps && target > 2)
-		target /= 2;
+	if (lvp == NULL) {
+		target = numdirtybuffers - lodirtybuffers;
+		if (flushdeps && target > 2)
+			target /= 2;
+	} else
+		target = flushbufqtarget;
 	flushed = 0;
 	bp = NULL;
+	sentinel.b_qindex = QUEUE_SENTINEL;
 	mtx_lock(&bqlock);
-	TAILQ_INSERT_TAIL(&bufqueues[queue], &sentinel, b_freelist);
+	TAILQ_INSERT_HEAD(&bufqueues[queue], &sentinel, b_freelist);
 	while (flushed != target) {
-		bp = TAILQ_FIRST(&bufqueues[queue]);
-		if (bp == &sentinel)
+		bp = TAILQ_NEXT(&sentinel, b_freelist);
+		if (bp != NULL) {
+			TAILQ_REMOVE(&bufqueues[queue], &sentinel, b_freelist);
+			TAILQ_INSERT_AFTER(&bufqueues[queue], bp, &sentinel,
+			    b_freelist);
+		} else
 			break;
-		TAILQ_REMOVE(&bufqueues[queue], bp, b_freelist);
-		TAILQ_INSERT_TAIL(&bufqueues[queue], bp, b_freelist);
-
+		/*
+		 * Skip sentinels inserted by other invocations of the
+		 * flushbufqueues(), taking care to not reorder them.
+		 */
+		if (bp->b_qindex == QUEUE_SENTINEL)
+			continue;
+		/*
+		 * Only flush the buffers that belong to the
+		 * vnode locked by the curthread.
+		 */
+		if (lvp != NULL && bp->b_vp != lvp)
+			continue;
 		if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL) != 0)
 			continue;
 		if (bp->b_pin_count > 0) {
@@ -2212,16 +2270,28 @@ flushbufqueues(int queue, int flushdeps)
 			BUF_UNLOCK(bp);
 			continue;
 		}
-		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT, td) == 0) {
+		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_CANRECURSE,
+		    td) == 0) {
 			mtx_unlock(&bqlock);
 			CTR3(KTR_BUF, "flushbufqueue(%p) vp %p flags %X",
 			    bp, bp->b_vp, bp->b_flags);
-			vfs_bio_awrite(bp);
+			if (curproc == bufdaemonproc)
+				vfs_bio_awrite(bp);
+			else {
+				bremfree(bp);
+				bwrite(bp);
+			}
 			vn_finished_write(mp);
 			VOP_UNLOCK(vp, 0, td);
 			flushwithdeps += hasdeps;
 			flushed++;
-			waitrunningbufspace();
+
+			/*
+			 * Sleeping on runningbufspace while holding
+			 * vnode lock leads to deadlock.
+			 */
+			if (curproc == bufdaemonproc)
+				waitrunningbufspace();
 			numdirtywakeup((lodirtybuffers + hidirtybuffers) / 2);
 			mtx_lock(&bqlock);
 			continue;
@@ -2603,7 +2673,7 @@ loop:
 		maxsize = vmio ? size + (offset & PAGE_MASK) : size;
 		maxsize = imax(maxsize, bsize);
 
-		bp = getnewbuf(slpflag, slptimeo, size, maxsize);
+		bp = getnewbuf(vp, slpflag, slptimeo, size, maxsize, flags);
 		if (bp == NULL) {
 			if (slpflag || slptimeo)
 				return NULL;
@@ -2678,14 +2748,17 @@ loop:
  * set to B_INVAL.
  */
 struct buf *
-geteblk(int size)
+geteblk(int size, int flags)
 {
 	struct buf *bp;
 	int maxsize;
 
 	maxsize = (size + BKVAMASK) & ~BKVAMASK;
-	while ((bp = getnewbuf(0, 0, size, maxsize)) == 0)
-		continue;
+	while ((bp = getnewbuf(NULL, 0, 0, size, maxsize, flags)) == NULL) {
+		if ((flags & GB_NOWAIT_BD) &&
+		    (curthread->td_pflags & TDP_BUFNEED) != 0)
+			return (NULL);
+	}
 	allocbuf(bp, size);
 	bp->b_flags |= B_INVAL;	/* b_dep cleared by getnewbuf() */
 	KASSERT(BUF_REFCNT(bp) == 1, ("geteblk: bp %p not locked",bp));

Modified: stable/7/sys/sys/buf.h
==============================================================================
--- stable/7/sys/sys/buf.h	Tue May  5 09:24:20 2009	(r191812)
+++ stable/7/sys/sys/buf.h	Tue May  5 10:34:43 2009	(r191813)
@@ -475,6 +475,7 @@ buf_countdeps(struct buf *bp, int i)
  */
 #define	GB_LOCK_NOWAIT	0x0001		/* Fail if we block on a buf lock. */
 #define	GB_NOCREAT	0x0002		/* Don't create a buf if not found. */
+#define	GB_NOWAIT_BD	0x0004		/* Do not wait for bufdaemon */
 
 #ifdef _KERNEL
 extern int	nbuf;			/* The number of buffer headers */
@@ -519,7 +520,7 @@ struct buf *     getpbuf(int *);
 struct buf *incore(struct bufobj *, daddr_t);
 struct buf *gbincore(struct bufobj *, daddr_t);
 struct buf *getblk(struct vnode *, daddr_t, int, int, int, int);
-struct buf *geteblk(int);
+struct buf *geteblk(int, int);
 int	bufwait(struct buf *);
 int	bufwrite(struct buf *);
 void	bufdone(struct buf *);

Modified: stable/7/sys/sys/proc.h
==============================================================================
--- stable/7/sys/sys/proc.h	Tue May  5 09:24:20 2009	(r191812)
+++ stable/7/sys/sys/proc.h	Tue May  5 10:34:43 2009	(r191813)
@@ -380,6 +380,7 @@ do {									\
 #define	TDP_INBDFLUSH	0x00100000 /* Already in BO_BDFLUSH, do not recurse */
 #define	TDP_IGNSUSP	0x00800000 /* Permission to ignore the MNTK_SUSPEND* */
 #define	TDP_AUDITREC	0x01000000 /* Audit record pending on thread */
+#define	TDP_BUFNEED	0x02000000 /* Do not recurse into the buf flush */
 
 /*
  * Reasons that the current thread can not be run yet.

Modified: stable/7/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/7/sys/ufs/ffs/ffs_vfsops.c	Tue May  5 09:24:20 2009	(r191812)
+++ stable/7/sys/ufs/ffs/ffs_vfsops.c	Tue May  5 10:34:43 2009	(r191813)
@@ -1842,7 +1842,9 @@ ffs_bufwrite(struct buf *bp)
 		    ("bufwrite: needs chained iodone (%p)", bp->b_iodone));
 
 		/* get a new block */
-		newbp = geteblk(bp->b_bufsize);
+		newbp = geteblk(bp->b_bufsize, GB_NOWAIT_BD);
+		if (newbp == NULL)
+			goto normal_write;
 
 		/*
 		 * set it to be identical to the old block.  We have to
@@ -1882,6 +1884,7 @@ ffs_bufwrite(struct buf *bp)
 	}
 
 	/* Let the normal bufwrite do the rest for us */
+normal_write:
 	return (bufwrite(bp));
 }
 
From kib at FreeBSD.org  Tue May  5 10:43:15 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Tue May  5 10:43:27 2009
Subject: svn commit: r191814 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905051043.n45AhE9E078962@svn.freebsd.org>

Author: kib
Date: Tue May  5 10:43:14 2009
New Revision: 191814
URL: http://svn.freebsd.org/changeset/base/191814

Log:
  MFC r191135:
  Export the number of times bufdaemon got help from the normal threads.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/vfs_bio.c

Modified: stable/7/sys/kern/vfs_bio.c
==============================================================================
--- stable/7/sys/kern/vfs_bio.c	Tue May  5 10:34:43 2009	(r191813)
+++ stable/7/sys/kern/vfs_bio.c	Tue May  5 10:43:14 2009	(r191814)
@@ -191,6 +191,9 @@ SYSCTL_INT(_vfs, OID_AUTO, getnewbufrest
 static int flushbufqtarget = -1;
 SYSCTL_INT(_vfs, OID_AUTO, flushbufqtarget, CTLFLAG_RW, &flushbufqtarget, 0,
     "Amount of work to do in flushbufqueues when helping bufdaemon");
+static long notbufdflashes;
+SYSCTL_LONG(_vfs, OID_AUTO, notbufdflashes, CTLFLAG_RD, ¬bufdflashes, 0,
+    "Number of dirty buffer flushes done by the bufdaemon helpers");
 
 /*
  * Wakeup point for bufdaemon, as well as indicator of whether it is already
@@ -2280,6 +2283,7 @@ flushbufqueues(struct vnode *lvp, int qu
 			else {
 				bremfree(bp);
 				bwrite(bp);
+				notbufdflashes++;
 			}
 			vn_finished_write(mp);
 			VOP_UNLOCK(vp, 0, td);
From kib at FreeBSD.org  Tue May  5 10:46:50 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Tue May  5 10:47:02 2009
Subject: svn commit: r191815 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905051046.n45Akn7l079094@svn.freebsd.org>

Author: kib
Date: Tue May  5 10:46:49 2009
New Revision: 191815
URL: http://svn.freebsd.org/changeset/base/191815

Log:
  MFC r191136:
  In flushbufqueues(), do not allocate sentinel buffer on the stack,
  struct buf is large. Use sleeping malloc(9) call, and zero the allocated
  buf as a debugging feature.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/vfs_bio.c

Modified: stable/7/sys/kern/vfs_bio.c
==============================================================================
--- stable/7/sys/kern/vfs_bio.c	Tue May  5 10:43:14 2009	(r191814)
+++ stable/7/sys/kern/vfs_bio.c	Tue May  5 10:46:49 2009	(r191815)
@@ -2187,7 +2187,7 @@ static int
 flushbufqueues(struct vnode *lvp, int queue, int flushdeps)
 {
 	struct thread *td = curthread;
-	struct buf sentinel;
+	struct buf *sentinel;
 	struct vnode *vp;
 	struct mount *mp;
 	struct buf *bp;
@@ -2203,14 +2203,15 @@ flushbufqueues(struct vnode *lvp, int qu
 		target = flushbufqtarget;
 	flushed = 0;
 	bp = NULL;
-	sentinel.b_qindex = QUEUE_SENTINEL;
+	sentinel = malloc(sizeof(struct buf), M_TEMP, M_WAITOK | M_ZERO);
+	sentinel->b_qindex = QUEUE_SENTINEL;
 	mtx_lock(&bqlock);
-	TAILQ_INSERT_HEAD(&bufqueues[queue], &sentinel, b_freelist);
+	TAILQ_INSERT_HEAD(&bufqueues[queue], sentinel, b_freelist);
 	while (flushed != target) {
-		bp = TAILQ_NEXT(&sentinel, b_freelist);
+		bp = TAILQ_NEXT(sentinel, b_freelist);
 		if (bp != NULL) {
-			TAILQ_REMOVE(&bufqueues[queue], &sentinel, b_freelist);
-			TAILQ_INSERT_AFTER(&bufqueues[queue], bp, &sentinel,
+			TAILQ_REMOVE(&bufqueues[queue], sentinel, b_freelist);
+			TAILQ_INSERT_AFTER(&bufqueues[queue], bp, sentinel,
 			    b_freelist);
 		} else
 			break;
@@ -2303,8 +2304,9 @@ flushbufqueues(struct vnode *lvp, int qu
 		vn_finished_write(mp);
 		BUF_UNLOCK(bp);
 	}
-	TAILQ_REMOVE(&bufqueues[queue], &sentinel, b_freelist);
+	TAILQ_REMOVE(&bufqueues[queue], sentinel, b_freelist);
 	mtx_unlock(&bqlock);
+	free(sentinel, M_TEMP);
 	return (flushed);
 }
 
From jhb at FreeBSD.org  Tue May  5 14:46:19 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May  5 14:46:26 2009
Subject: svn commit: r191819 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/pci
Message-ID: <200905051446.n45EkIhZ084178@svn.freebsd.org>

Author: jhb
Date: Tue May  5 14:46:18 2009
New Revision: 191819
URL: http://svn.freebsd.org/changeset/base/191819

Log:
  MFC: Sync with HEAD
  - Proxy PCI MSI/MSI-X requests and bus interrupt requests for child devices
    instead of passing them through directly.  This allows child devices to use
    MSI/MSI-X interrupts.
  - Proxy PCI VPD requests.
  - Proxy bus resource allocation requests to allow multiple child devices to
    share access to a BAR.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/pci/vga_pci.c

Modified: stable/7/sys/dev/pci/vga_pci.c
==============================================================================
--- stable/7/sys/dev/pci/vga_pci.c	Tue May  5 13:48:53 2009	(r191818)
+++ stable/7/sys/dev/pci/vga_pci.c	Tue May  5 14:46:18 2009	(r191819)
@@ -42,10 +42,22 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
 
+struct vga_resource {
+	struct resource	*vr_res;
+	int	vr_refs;
+};
+
+struct vga_pci_softc {
+	device_t	vga_msi_child;	/* Child driver using MSI. */
+	struct vga_resource vga_res[PCIR_MAX_BAR_0 + 1];
+};
+
 static int
 vga_pci_probe(device_t dev)
 {
@@ -106,11 +118,47 @@ vga_pci_write_ivar(device_t dev, device_
 	return (EINVAL);
 }
 
+static int
+vga_pci_setup_intr(device_t dev, device_t child, struct resource *irq,
+    int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg,
+    void **cookiep)
+{
+	return (BUS_SETUP_INTR(device_get_parent(dev), dev, irq, flags,
+	    filter, intr, arg, cookiep));
+}
+
+static int
+vga_pci_teardown_intr(device_t dev, device_t child, struct resource *irq,
+    void *cookie)
+{
+	return (BUS_TEARDOWN_INTR(device_get_parent(dev), dev, irq, cookie));
+}
+
 static struct resource *
 vga_pci_alloc_resource(device_t dev, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
+	struct vga_pci_softc *sc;
+	int bar;
 
+	switch (type) {
+	case SYS_RES_MEMORY:
+	case SYS_RES_IOPORT:
+		/*
+		 * For BARs, we cache the resource so that we only allocate it
+		 * from the PCI bus once.
+		 */
+		bar = PCI_RID2BAR(*rid);
+		if (bar < 0 || bar > PCIR_MAX_BAR_0)
+			return (NULL);
+		sc = device_get_softc(dev);
+		if (sc->vga_res[bar].vr_res == NULL)
+			sc->vga_res[bar].vr_res = bus_alloc_resource(dev, type,
+			    rid, start, end, count, flags);
+		if (sc->vga_res[bar].vr_res != NULL)
+			sc->vga_res[bar].vr_refs++;
+		return (sc->vga_res[bar].vr_res);
+	}
 	return (bus_alloc_resource(dev, type, rid, start, end, count, flags));
 }
 
@@ -118,6 +166,37 @@ static int
 vga_pci_release_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r)
 {
+	struct vga_pci_softc *sc;
+	int bar, error;
+
+	switch (type) {
+	case SYS_RES_MEMORY:
+	case SYS_RES_IOPORT:
+		/*
+		 * For BARs, we release the resource from the PCI bus
+		 * when the last child reference goes away.
+		 */
+		bar = PCI_RID2BAR(rid);
+		if (bar < 0 || bar > PCIR_MAX_BAR_0)
+			return (EINVAL);
+		sc = device_get_softc(dev);
+		if (sc->vga_res[bar].vr_res == NULL)
+			return (EINVAL);
+		KASSERT(sc->vga_res[bar].vr_res == r,
+		    ("vga_pci resource mismatch"));
+		if (sc->vga_res[bar].vr_refs > 1) {
+			sc->vga_res[bar].vr_refs--;
+			return (0);
+		}
+		KASSERT(sc->vga_res[bar].vr_refs > 0,
+		    ("vga_pci resource reference count underflow"));
+		error = bus_release_resource(dev, type, rid, r);
+		if (error == 0) {
+			sc->vga_res[bar].vr_res = NULL;
+			sc->vga_res[bar].vr_refs = 0;
+		}
+		return (error);
+	}
 
 	return (bus_release_resource(dev, type, rid, r));
 }
@@ -176,6 +255,21 @@ vga_pci_disable_io(device_t dev, device_
 }
 
 static int
+vga_pci_get_vpd_ident(device_t dev, device_t child, const char **identptr)
+{
+
+	return (pci_get_vpd_ident(dev, identptr));
+}
+
+static int
+vga_pci_get_vpd_readonly(device_t dev, device_t child, const char *kw,
+    const char **vptr)
+{
+
+	return (pci_get_vpd_readonly(dev, kw, vptr));
+}
+
+static int
 vga_pci_set_powerstate(device_t dev, device_t child, int state)
 {
 
@@ -210,6 +304,77 @@ vga_pci_find_extcap(device_t dev, device
 	return (pci_find_extcap(dev, capability, capreg));
 }
 
+static int
+vga_pci_alloc_msi(device_t dev, device_t child, int *count)
+{
+	struct vga_pci_softc *sc;
+	int error;
+
+	sc = device_get_softc(dev);
+	if (sc->vga_msi_child != NULL)
+		return (EBUSY);
+	error = pci_alloc_msi(dev, count);
+	if (error == 0)
+		sc->vga_msi_child = child;
+	return (error);
+}
+
+static int
+vga_pci_alloc_msix(device_t dev, device_t child, int *count)
+{
+	struct vga_pci_softc *sc;
+	int error;
+
+	sc = device_get_softc(dev);
+	if (sc->vga_msi_child != NULL)
+		return (EBUSY);
+	error = pci_alloc_msix(dev, count);
+	if (error == 0)
+		sc->vga_msi_child = child;
+	return (error);
+}
+
+static int
+vga_pci_remap_msix(device_t dev, device_t child, int count,
+    const u_int *vectors)
+{
+	struct vga_pci_softc *sc;
+
+	sc = device_get_softc(dev);
+	if (sc->vga_msi_child != child)
+		return (ENXIO);
+	return (pci_remap_msix(dev, count, vectors));
+}
+
+static int
+vga_pci_release_msi(device_t dev, device_t child)
+{
+	struct vga_pci_softc *sc;
+	int error;
+
+	sc = device_get_softc(dev);
+	if (sc->vga_msi_child != child)
+		return (ENXIO);
+	error = pci_release_msi(dev);
+	if (error == 0)
+		sc->vga_msi_child = NULL;
+	return (error);
+}
+
+static int
+vga_pci_msi_count(device_t dev, device_t child)
+{
+
+	return (pci_msi_count(dev));
+}
+
+static int
+vga_pci_msix_count(device_t dev, device_t child)
+{
+
+	return (pci_msix_count(dev));
+}
+
 static device_method_t vga_pci_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		vga_pci_probe),
@@ -221,8 +386,8 @@ static device_method_t vga_pci_methods[]
 	/* Bus interface */
 	DEVMETHOD(bus_read_ivar,	vga_pci_read_ivar),
 	DEVMETHOD(bus_write_ivar,	vga_pci_write_ivar),
-	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
+	DEVMETHOD(bus_setup_intr,	vga_pci_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	vga_pci_teardown_intr),
 
 	DEVMETHOD(bus_alloc_resource,	vga_pci_alloc_resource),
 	DEVMETHOD(bus_release_resource,	vga_pci_release_resource),
@@ -236,10 +401,18 @@ static device_method_t vga_pci_methods[]
 	DEVMETHOD(pci_disable_busmaster, vga_pci_disable_busmaster),
 	DEVMETHOD(pci_enable_io,	vga_pci_enable_io),
 	DEVMETHOD(pci_disable_io,	vga_pci_disable_io),
+	DEVMETHOD(pci_get_vpd_ident,	vga_pci_get_vpd_ident),
+	DEVMETHOD(pci_get_vpd_readonly,	vga_pci_get_vpd_readonly),
 	DEVMETHOD(pci_get_powerstate,	vga_pci_get_powerstate),
 	DEVMETHOD(pci_set_powerstate,	vga_pci_set_powerstate),
 	DEVMETHOD(pci_assign_interrupt,	vga_pci_assign_interrupt),
 	DEVMETHOD(pci_find_extcap,	vga_pci_find_extcap),
+	DEVMETHOD(pci_alloc_msi,	vga_pci_alloc_msi),
+	DEVMETHOD(pci_alloc_msix,	vga_pci_alloc_msix),
+	DEVMETHOD(pci_remap_msix,	vga_pci_remap_msix),
+	DEVMETHOD(pci_release_msi,	vga_pci_release_msi),
+	DEVMETHOD(pci_msi_count,	vga_pci_msi_count),
+	DEVMETHOD(pci_msix_count,	vga_pci_msix_count),
 
 	{ 0, 0 }
 };
@@ -247,7 +420,7 @@ static device_method_t vga_pci_methods[]
 static driver_t vga_pci_driver = {
 	"vgapci",
 	vga_pci_methods,
-	1,
+	sizeof(struct vga_pci_softc),
 };
 
 static devclass_t vga_devclass;
From dchagin at FreeBSD.org  Tue May  5 14:53:59 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Tue May  5 14:54:16 2009
Subject: svn commit: r191820 - in stable/7/sys: . amd64/linux32 compat/linux
	contrib/pf dev/ath/ath_hal dev/cxgb i386/linux
Message-ID: <200905051453.n45ErwaK084362@svn.freebsd.org>

Author: dchagin
Date: Tue May  5 14:53:58 2009
New Revision: 191820
URL: http://svn.freebsd.org/changeset/base/191820

Log:
  Merge from HEAD to stable/7:
  
  r178976 (rdivacky):
  Implement robust futexes. Most of the code is modelled after
  what Linux does. This is because robust futexes are mostly
  userspace thing which we cannot alter. Two syscalls maintain
  pointer to userspace list and when process exits a routine
  walks this list waking up processes sleeping on futexes
  from that list.
  
  r183871:
  Make robust futexes work on linux32/amd64. Use PTRIN to read
  user-mode pointers. Change types used in the structures definitions to
  properly-sized architecture-specific types.
  
  r185002:
  In the robust futexes list head, futex_offset shall be signed,
  and glibc actually supplies negative offsets. Change l_ulong to l_long.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/linux32/linux.h
  stable/7/sys/amd64/linux32/linux32_dummy.c
  stable/7/sys/amd64/linux32/syscalls.master
  stable/7/sys/compat/linux/linux_emul.c
  stable/7/sys/compat/linux/linux_emul.h
  stable/7/sys/compat/linux/linux_futex.c
  stable/7/sys/compat/linux/linux_futex.h
  stable/7/sys/compat/linux/linux_misc.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/linux/linux.h
  stable/7/sys/i386/linux/linux_dummy.c
  stable/7/sys/i386/linux/syscalls.master

Modified: stable/7/sys/amd64/linux32/linux.h
==============================================================================
--- stable/7/sys/amd64/linux32/linux.h	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/amd64/linux32/linux.h	Tue May  5 14:53:58 2009	(r191820)
@@ -886,4 +886,15 @@ typedef int l_mqd_t;
 	(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES |	\
 	LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
 
+/* robust futexes */
+struct linux_robust_list {
+	l_uintptr_t			next;
+};
+
+struct linux_robust_list_head {
+	struct linux_robust_list	list;
+	l_long				futex_offset;
+	l_uintptr_t			pending_list;
+};
+
 #endif /* !_AMD64_LINUX_H_ */

Modified: stable/7/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_dummy.c	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/amd64/linux32/linux32_dummy.c	Tue May  5 14:53:58 2009	(r191820)
@@ -111,8 +111,6 @@ DUMMY(faccessat);
 DUMMY(pselect6);
 DUMMY(ppoll);
 DUMMY(unshare);
-DUMMY(set_robust_list);
-DUMMY(get_robust_list);
 DUMMY(splice);
 DUMMY(sync_file_range);
 DUMMY(tee);

Modified: stable/7/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/7/sys/amd64/linux32/syscalls.master	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/amd64/linux32/syscalls.master	Tue May  5 14:53:58 2009	(r191820)
@@ -482,8 +482,10 @@
 308	AUE_NULL	STD	{ int linux_pselect6(void); }
 309	AUE_NULL	STD	{ int linux_ppoll(void); }
 310	AUE_NULL	STD	{ int linux_unshare(void); }
-311	AUE_NULL	STD	{ int linux_set_robust_list(void); }
-312	AUE_NULL	STD	{ int linux_get_robust_list(void); }
+311	AUE_NULL	STD	{ int linux_set_robust_list(struct linux_robust_list_head *head, \
+					l_size_t len); }
+312	AUE_NULL	STD	{ int linux_get_robust_list(l_int pid, struct linux_robust_list_head *head, \
+					l_size_t *len); }
 313	AUE_NULL	STD	{ int linux_splice(void); }
 314	AUE_NULL	STD	{ int linux_sync_file_range(void); }
 315	AUE_NULL	STD	{ int linux_tee(void); }

Modified: stable/7/sys/compat/linux/linux_emul.c
==============================================================================
--- stable/7/sys/compat/linux/linux_emul.c	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/compat/linux/linux_emul.c	Tue May  5 14:53:58 2009	(r191820)
@@ -44,9 +44,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#include 
-#include 
-
 #ifdef COMPAT_LINUX32
 #include 
 #include 
@@ -55,6 +52,9 @@ __FBSDID("$FreeBSD$");
 #include 
 #endif
 
+#include 
+#include 
+
 struct sx	emul_shared_lock;
 struct mtx	emul_lock;
 
@@ -86,6 +86,7 @@ linux_proc_init(struct thread *td, pid_t
 		em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO);
 		em->pid = child;
 		em->pdeath_signal = 0;
+		em->robust_futexes = NULL;
 		if (flags & LINUX_CLONE_THREAD) {
 			/* handled later in the code */
 		} else {
@@ -161,6 +162,8 @@ linux_proc_exit(void *arg __unused, stru
 	if (__predict_true(p->p_sysent != &elf_linux_sysvec))
 		return;
 
+	release_futexes(p);
+
 	/* find the emuldata */
 	em = em_find(p, EMUL_DOLOCK);
 

Modified: stable/7/sys/compat/linux/linux_emul.h
==============================================================================
--- stable/7/sys/compat/linux/linux_emul.h	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/compat/linux/linux_emul.h	Tue May  5 14:53:58 2009	(r191820)
@@ -31,6 +31,8 @@
 #ifndef _LINUX_EMUL_H_
 #define	_LINUX_EMUL_H_
 
+#include 
+
 struct linux_emuldata_shared {
 	int	refs;
 	pid_t	group_pid;
@@ -52,6 +54,8 @@ struct linux_emuldata {
 
 	int	pdeath_signal;		/* parent death signal */
 
+	struct	linux_robust_list_head	*robust_futexes;
+
 	LIST_ENTRY(linux_emuldata) threads;	/* list of linux threads */
 };
 

Modified: stable/7/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.c	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/compat/linux/linux_futex.c	Tue May  5 14:53:58 2009	(r191820)
@@ -45,8 +45,11 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -57,6 +60,7 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.
 #include 
 #include 
 #endif
+#include 
 #include 
 
 struct futex;
@@ -533,3 +537,160 @@ futex_atomic_op(struct thread *td, int e
 		return (-ENOSYS);
 	}
 }
+
+int
+linux_set_robust_list(struct thread *td, struct linux_set_robust_list_args *args)
+{
+	struct linux_emuldata *em;
+
+#ifdef	DEBUG
+	if (ldebug(set_robust_list))
+		printf(ARGS(set_robust_list, ""));
+#endif
+	if (args->len != sizeof(struct linux_robust_list_head))
+		return (EINVAL);
+
+	em = em_find(td->td_proc, EMUL_DOLOCK);
+	em->robust_futexes = args->head;
+	EMUL_UNLOCK(&emul_lock);
+
+	return (0);	
+}
+
+int
+linux_get_robust_list(struct thread *td, struct linux_get_robust_list_args *args)
+{
+	struct linux_emuldata *em;
+	struct linux_robust_list_head *head;
+	l_size_t len = sizeof(struct linux_robust_list_head);
+	int error = 0;
+
+#ifdef	DEBUG
+	if (ldebug(get_robust_list))
+		printf(ARGS(get_robust_list, ""));
+#endif
+
+	if (!args->pid) {
+		em = em_find(td->td_proc, EMUL_DONTLOCK);
+		head = em->robust_futexes;		
+	} else {
+		struct proc *p;
+
+		p = pfind(args->pid);
+		if (p == NULL)
+			return (ESRCH);
+
+		em = em_find(p, EMUL_DONTLOCK);
+		/* XXX: ptrace? */
+		if (priv_check(td, PRIV_CRED_SETUID) || 
+		    priv_check(td, PRIV_CRED_SETEUID) ||
+		    p_candebug(td, p))
+			return (EPERM);
+		head = em->robust_futexes;
+		
+		PROC_UNLOCK(p);
+	}
+
+	error = copyout(&len, args->len, sizeof(l_size_t));
+	if (error)
+		return (EFAULT);
+
+	error = copyout(head, args->head, sizeof(struct linux_robust_list_head));
+
+	return (error);
+}
+
+static int
+handle_futex_death(void *uaddr, pid_t pid, int pi)
+{
+	int uval, nval, mval;
+	struct futex *f;
+
+retry:
+	if (copyin(uaddr, &uval, 4))
+		return (EFAULT);
+
+	if ((uval & FUTEX_TID_MASK) == pid) {
+		mval = (uval & FUTEX_WAITERS) | FUTEX_OWNER_DIED;
+		nval = casuword32(uaddr, uval, mval);
+
+		if (nval == -1)
+			return (EFAULT);
+
+		if (nval != uval)
+			goto retry;
+
+		if (!pi && (uval & FUTEX_WAITERS)) {
+			f = futex_get(uaddr, FUTEX_UNLOCKED);
+			futex_wake(f, 1, NULL, 0);
+		}
+	}
+
+	return (0);
+}
+
+static int
+fetch_robust_entry(struct linux_robust_list **entry,
+    struct linux_robust_list **head, int *pi)
+{
+	l_ulong uentry;
+
+	if (copyin((const void *)head, &uentry, sizeof(l_ulong)))
+		return (EFAULT);
+
+	*entry = (void *)(uentry & ~1UL);
+	*pi = uentry & 1;
+
+	return (0);
+}
+
+/* This walks the list of robust futexes releasing them. */
+void
+release_futexes(struct proc *p)
+{
+	struct linux_robust_list_head *head = NULL;
+	struct linux_robust_list *entry, *next_entry, *pending;
+	unsigned int limit = 2048, pi, next_pi, pip;
+	struct linux_emuldata *em;
+	l_long futex_offset;
+	int rc;
+
+	em = em_find(p, EMUL_DONTLOCK);
+	head = em->robust_futexes;
+
+	if (head == NULL)
+		return;
+
+	if (fetch_robust_entry(&entry, PTRIN(&head->list.next), &pi))
+		return;
+
+	if (copyin(&head->futex_offset, &futex_offset, sizeof(futex_offset)))
+		return;
+
+	if (fetch_robust_entry(&pending, PTRIN(&head->pending_list), &pip))
+		return;
+
+	while (entry != &head->list) {
+		rc = fetch_robust_entry(&next_entry, PTRIN(&entry->next), &next_pi);
+
+		if (entry != pending)
+			if (handle_futex_death((char *)entry + futex_offset,
+			    p->p_pid, pi))
+				return;
+
+		if (rc)
+			return;
+
+		entry = next_entry;
+		pi = next_pi;
+
+		if (!--limit)
+			break;
+
+		sched_relinquish(curthread);
+	}
+
+	if (pending)
+		handle_futex_death((char *) pending + futex_offset,
+		    p->p_pid, pip);
+}

Modified: stable/7/sys/compat/linux/linux_futex.h
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.h	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/compat/linux/linux_futex.h	Tue May  5 14:53:58 2009	(r191820)
@@ -63,4 +63,10 @@
 #define FUTEX_OP_CMP_GT         4	/* if (oldval > CMPARG) wake */
 #define FUTEX_OP_CMP_GE         5	/* if (oldval >= CMPARG) wake */
 
+#define	FUTEX_WAITERS		0x80000000
+#define	FUTEX_OWNER_DIED	0x40000000
+#define	FUTEX_TID_MASK		0x3fffffff
+
+void	release_futexes(struct proc *);
+
 #endif	/* !_LINUX_FUTEX_H */

Modified: stable/7/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/7/sys/compat/linux/linux_misc.c	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/compat/linux/linux_misc.c	Tue May  5 14:53:58 2009	(r191820)
@@ -75,10 +75,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#include 
-#include 
-#include 
-
 #ifdef COMPAT_LINUX32
 #include 
 #include 
@@ -90,6 +86,9 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #define BSD_TO_LINUX_SIGNAL(sig)	\
 	(((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig)

Modified: stable/7/sys/i386/linux/linux.h
==============================================================================
--- stable/7/sys/i386/linux/linux.h	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/i386/linux/linux.h	Tue May  5 14:53:58 2009	(r191820)
@@ -851,4 +851,15 @@ typedef int l_mqd_t;
 	(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES |	\
 	LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
 
+/* robust futexes */
+struct linux_robust_list {
+	struct linux_robust_list	*next;
+};
+
+struct linux_robust_list_head {
+	struct linux_robust_list	list;
+	l_long				futex_offset;
+	struct linux_robust_list	*pending_list;
+};
+
 #endif /* !_I386_LINUX_H_ */

Modified: stable/7/sys/i386/linux/linux_dummy.c
==============================================================================
--- stable/7/sys/i386/linux/linux_dummy.c	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/i386/linux/linux_dummy.c	Tue May  5 14:53:58 2009	(r191820)
@@ -102,8 +102,6 @@ DUMMY(faccessat);
 DUMMY(pselect6);
 DUMMY(ppoll);
 DUMMY(unshare);
-DUMMY(set_robust_list);
-DUMMY(get_robust_list);
 DUMMY(splice);
 DUMMY(sync_file_range);
 DUMMY(tee);

Modified: stable/7/sys/i386/linux/syscalls.master
==============================================================================
--- stable/7/sys/i386/linux/syscalls.master	Tue May  5 14:46:18 2009	(r191819)
+++ stable/7/sys/i386/linux/syscalls.master	Tue May  5 14:53:58 2009	(r191820)
@@ -492,8 +492,10 @@
 308	AUE_NULL	STD	{ int linux_pselect6(void); }
 309	AUE_NULL	STD	{ int linux_ppoll(void); }
 310	AUE_NULL	STD	{ int linux_unshare(void); }
-311	AUE_NULL	STD	{ int linux_set_robust_list(void); }
-312	AUE_NULL	STD	{ int linux_get_robust_list(void); }
+311	AUE_NULL	STD	{ int linux_set_robust_list(struct linux_robust_list_head *head, \
+					l_size_t len); }
+312	AUE_NULL	STD	{ int linux_get_robust_list(l_int pid, struct linux_robust_list_head **head, \
+					l_size_t *len); }
 313	AUE_NULL	STD	{ int linux_splice(void); }
 314	AUE_NULL	STD	{ int linux_sync_file_range(void); }
 315	AUE_NULL	STD	{ int linux_tee(void); }
From dchagin at FreeBSD.org  Tue May  5 14:55:24 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Tue May  5 14:55:41 2009
Subject: svn commit: r191821 - in stable/7/sys: amd64/linux32 i386/linux
Message-ID: <200905051455.n45EtN7c084459@svn.freebsd.org>

Author: dchagin
Date: Tue May  5 14:55:23 2009
New Revision: 191821
URL: http://svn.freebsd.org/changeset/base/191821

Log:
  Regenerate syscall table after 191820.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/amd64/linux32/linux32_proto.h
  stable/7/sys/amd64/linux32/linux32_syscall.h
  stable/7/sys/amd64/linux32/linux32_sysent.c
  stable/7/sys/i386/linux/linux_proto.h
  stable/7/sys/i386/linux/linux_syscall.h
  stable/7/sys/i386/linux/linux_sysent.c

Modified: stable/7/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_proto.h	Tue May  5 14:53:58 2009	(r191820)
+++ stable/7/sys/amd64/linux32/linux32_proto.h	Tue May  5 14:55:23 2009	(r191821)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 191804 2009-05-05 03:49:30Z dchagin 
+ * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -937,10 +937,13 @@ struct linux_unshare_args {
 	register_t dummy;
 };
 struct linux_set_robust_list_args {
-	register_t dummy;
+	char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
+	char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)];
 };
 struct linux_get_robust_list_args {
-	register_t dummy;
+	char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
+	char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
+	char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)];
 };
 struct linux_splice_args {
 	register_t dummy;

Modified: stable/7/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_syscall.h	Tue May  5 14:53:58 2009	(r191820)
+++ stable/7/sys/amd64/linux32/linux32_syscall.h	Tue May  5 14:55:23 2009	(r191821)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 191804 2009-05-05 03:49:30Z dchagin 
+ * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
  */
 
 #define	LINUX_SYS_exit	1

Modified: stable/7/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_sysent.c	Tue May  5 14:53:58 2009	(r191820)
+++ stable/7/sys/amd64/linux32/linux32_sysent.c	Tue May  5 14:55:23 2009	(r191821)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 191804 2009-05-05 03:49:30Z dchagin 
+ * created from FreeBSD: stable/7/sys/amd64/linux32/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
  */
 
 #include "opt_compat.h"
@@ -330,8 +330,8 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 },	/* 308 = linux_pselect6 */
 	{ 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 },	/* 309 = linux_ppoll */
 	{ 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 },	/* 310 = linux_unshare */
-	{ 0, (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 },	/* 311 = linux_set_robust_list */
-	{ 0, (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 },	/* 312 = linux_get_robust_list */
+	{ AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 },	/* 311 = linux_set_robust_list */
+	{ AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 },	/* 312 = linux_get_robust_list */
 	{ 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0 },	/* 313 = linux_splice */
 	{ 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0 },	/* 314 = linux_sync_file_range */
 	{ 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0 },		/* 315 = linux_tee */

Modified: stable/7/sys/i386/linux/linux_proto.h
==============================================================================
--- stable/7/sys/i386/linux/linux_proto.h	Tue May  5 14:53:58 2009	(r191820)
+++ stable/7/sys/i386/linux/linux_proto.h	Tue May  5 14:55:23 2009	(r191821)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191804 2009-05-05 03:49:30Z dchagin 
+ * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -956,10 +956,13 @@ struct linux_unshare_args {
 	register_t dummy;
 };
 struct linux_set_robust_list_args {
-	register_t dummy;
+	char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
+	char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)];
 };
 struct linux_get_robust_list_args {
-	register_t dummy;
+	char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
+	char head_l_[PADL_(struct linux_robust_list_head **)]; struct linux_robust_list_head ** head; char head_r_[PADR_(struct linux_robust_list_head **)];
+	char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)];
 };
 struct linux_splice_args {
 	register_t dummy;

Modified: stable/7/sys/i386/linux/linux_syscall.h
==============================================================================
--- stable/7/sys/i386/linux/linux_syscall.h	Tue May  5 14:53:58 2009	(r191820)
+++ stable/7/sys/i386/linux/linux_syscall.h	Tue May  5 14:55:23 2009	(r191821)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191804 2009-05-05 03:49:30Z dchagin 
+ * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
  */
 
 #define	LINUX_SYS_exit	1

Modified: stable/7/sys/i386/linux/linux_sysent.c
==============================================================================
--- stable/7/sys/i386/linux/linux_sysent.c	Tue May  5 14:53:58 2009	(r191820)
+++ stable/7/sys/i386/linux/linux_sysent.c	Tue May  5 14:55:23 2009	(r191821)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191804 2009-05-05 03:49:30Z dchagin 
+ * created from FreeBSD: stable/7/sys/i386/linux/syscalls.master 191820 2009-05-05 14:53:58Z dchagin 
  */
 
 #include 
@@ -329,8 +329,8 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 },	/* 308 = linux_pselect6 */
 	{ 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 },	/* 309 = linux_ppoll */
 	{ 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 },	/* 310 = linux_unshare */
-	{ 0, (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 },	/* 311 = linux_set_robust_list */
-	{ 0, (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 },	/* 312 = linux_get_robust_list */
+	{ AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 },	/* 311 = linux_set_robust_list */
+	{ AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 },	/* 312 = linux_get_robust_list */
 	{ 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0 },	/* 313 = linux_splice */
 	{ 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0 },	/* 314 = linux_sync_file_range */
 	{ 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0 },		/* 315 = linux_tee */
From dchagin at FreeBSD.org  Tue May  5 15:19:47 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Tue May  5 15:19:58 2009
Subject: svn commit: r191823 - in stable/7/sys: . compat/linux contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905051519.n45FJkZ1085113@svn.freebsd.org>

Author: dchagin
Date: Tue May  5 15:19:45 2009
New Revision: 191823
URL: http://svn.freebsd.org/changeset/base/191823

Log:
  Merge from HEAD to stable/7:
  
  r189861:
  Include linux_futex.h before linux_emul.h
  
  r189862:
  Ignore FUTEX_FD op, as it is done by linux.
  
  r189867:
  Sort include files in the alphabetical order.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_emul.h
  stable/7/sys/compat/linux/linux_futex.c
  stable/7/sys/compat/linux/linux_futex.h
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linux/linux_emul.h
==============================================================================
--- stable/7/sys/compat/linux/linux_emul.h	Tue May  5 15:03:19 2009	(r191822)
+++ stable/7/sys/compat/linux/linux_emul.h	Tue May  5 15:19:45 2009	(r191823)
@@ -31,8 +31,6 @@
 #ifndef _LINUX_EMUL_H_
 #define	_LINUX_EMUL_H_
 
-#include 
-
 struct linux_emuldata_shared {
 	int	refs;
 	pid_t	group_pid;

Modified: stable/7/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.c	Tue May  5 15:03:19 2009	(r191822)
+++ stable/7/sys/compat/linux/linux_futex.c	Tue May  5 15:19:45 2009	(r191823)
@@ -40,18 +40,17 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.
 #include "opt_compat.h"
 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
-#include 
 
 #ifdef COMPAT_LINUX32
 #include 
@@ -60,8 +59,8 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.
 #include 
 #include 
 #endif
-#include 
 #include 
+#include 
 
 struct futex;
 
@@ -276,13 +275,6 @@ linux_sys_futex(struct thread *td, struc
 		FUTEX_SYSTEM_UNLOCK;
 		break;
 
-	case LINUX_FUTEX_FD:
-#ifdef DEBUG
-		printf("linux_sys_futex: unimplemented op %d\n",
-		    args->op);
-#endif
-		return (ENOSYS);
-
 	case LINUX_FUTEX_WAKE_OP:
 		FUTEX_SYSTEM_LOCK;
 #ifdef DEBUG

Modified: stable/7/sys/compat/linux/linux_futex.h
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.h	Tue May  5 15:03:19 2009	(r191822)
+++ stable/7/sys/compat/linux/linux_futex.h	Tue May  5 15:19:45 2009	(r191823)
@@ -38,7 +38,7 @@
 
 #define LINUX_FUTEX_WAIT	0
 #define LINUX_FUTEX_WAKE	1
-#define LINUX_FUTEX_FD		2
+#define LINUX_FUTEX_FD		2	/* unused */
 #define LINUX_FUTEX_REQUEUE	3
 #define LINUX_FUTEX_CMP_REQUEUE	4
 #define LINUX_FUTEX_WAKE_OP	5
From remko at FreeBSD.org  Tue May  5 16:37:34 2009
From: remko at FreeBSD.org (Remko Lodder)
Date: Tue May  5 16:37:50 2009
Subject: svn commit: r191830 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/usb
Message-ID: <200905051637.n45GbXCY087203@svn.freebsd.org>

Author: remko
Date: Tue May  5 16:37:33 2009
New Revision: 191830
URL: http://svn.freebsd.org/changeset/base/191830

Log:
  MFC r182896
  
    Add support for the CyberPower CP1500AVRLCD.
  
    PR: 126845
    Submitted by: gavin
    Approved by: imp (mentor, implicit)
    MFC after: 1 week
  
  Approved by:	imp (mentor, implicit)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/usb/usb_quirks.c

Modified: stable/7/sys/dev/usb/usb_quirks.c
==============================================================================
--- stable/7/sys/dev/usb/usb_quirks.c	Tue May  5 16:29:08 2009	(r191829)
+++ stable/7/sys/dev/usb/usb_quirks.c	Tue May  5 16:37:33 2009	(r191830)
@@ -98,6 +98,8 @@ static const struct usbd_quirk_entry {
 	ANY, { UQ_HID_IGNORE }},
  { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F6C550AVR,
 	ANY, { UQ_HID_IGNORE }},
+ { USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_1500CAVRLCD,
+	ANY, { UQ_HID_IGNORE }},
  { USB_VENDOR_DELORME, USB_PRODUCT_DELORME_EARTHMATE,
 	ANY, { UQ_HID_IGNORE }},
  { USB_VENDOR_ITUNERNET, USB_PRODUCT_ITUNERNET_USBLCD2X20,
From avg at FreeBSD.org  Tue May  5 18:02:09 2009
From: avg at FreeBSD.org (Andriy Gapon)
Date: Tue May  5 18:02:21 2009
Subject: svn commit: r191833 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905051802.n45I27T1089303@svn.freebsd.org>

Author: avg
Date: Tue May  5 18:02:07 2009
New Revision: 191833
URL: http://svn.freebsd.org/changeset/base/191833

Log:
  MFC r174848 by julian: give thread0 the tid 100000
  
  ... and bumpt the others to start at 100001.
  This is convenient for ACPI code that needs a thread id that is
  never zero.
  
  Reviewed by:	jkim
  Approved by:	jhb (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/init_main.c
  stable/7/sys/kern/kern_thread.c

Modified: stable/7/sys/kern/init_main.c
==============================================================================
--- stable/7/sys/kern/init_main.c	Tue May  5 17:22:48 2009	(r191832)
+++ stable/7/sys/kern/init_main.c	Tue May  5 18:02:07 2009	(r191833)
@@ -425,6 +425,7 @@ proc0_init(void *dummy __unused)
 	knlist_init(&p->p_klist, &p->p_mtx, NULL, NULL, NULL);
 	STAILQ_INIT(&p->p_ktr);
 	p->p_nice = NZERO;
+	td->td_tid = PID_MAX + 1;
 	td->td_state = TDS_RUNNING;
 	td->td_pri_class = PRI_TIMESHARE;
 	td->td_user_pri = PUSER;

Modified: stable/7/sys/kern/kern_thread.c
==============================================================================
--- stable/7/sys/kern/kern_thread.c	Tue May  5 17:22:48 2009	(r191832)
+++ stable/7/sys/kern/kern_thread.c	Tue May  5 18:02:07 2009	(r191833)
@@ -252,7 +252,8 @@ threadinit(void)
 {
 
 	mtx_init(&tid_lock, "TID lock", NULL, MTX_DEF);
-	tid_unrhdr = new_unrhdr(PID_MAX + 1, INT_MAX, &tid_lock);
+	/* leave one number for thread0 */
+	tid_unrhdr = new_unrhdr(PID_MAX + 2, INT_MAX, &tid_lock);
 
 	thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(),
 	    thread_ctor, thread_dtor, thread_init, thread_fini,
From delphij at FreeBSD.org  Wed May  6 22:26:05 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Wed May  6 22:26:17 2009
Subject: svn commit: r191860 - stable/7/usr.bin/truss
Message-ID: <200905062226.n46MQ4OI031714@svn.freebsd.org>

Author: delphij
Date: Wed May  6 22:26:04 2009
New Revision: 191860
URL: http://svn.freebsd.org/changeset/base/191860

Log:
  MFC r191004:
  
  Correct a bug where pr_data should have been assigned.

Modified:
  stable/7/usr.bin/truss/   (props changed)
  stable/7/usr.bin/truss/setup.c

Modified: stable/7/usr.bin/truss/setup.c
==============================================================================
--- stable/7/usr.bin/truss/setup.c	Wed May  6 20:48:45 2009	(r191859)
+++ stable/7/usr.bin/truss/setup.c	Wed May  6 22:26:04 2009	(r191860)
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copryight 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
@@ -214,8 +214,8 @@ waitevent(struct trussinfo *info)
 		}
 	}
 	if (WIFSIGNALED(waitval)) {
-	        info->pr_why = S_EXIT;
-		info->pr_why = 0;
-                return;
+		info->pr_why = S_EXIT;
+		info->pr_data = 0;
+		return;
 	}
 }
From delphij at FreeBSD.org  Wed May  6 22:26:50 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Wed May  6 22:26:56 2009
Subject: svn commit: r191861 - stable/7/usr.bin/truss
Message-ID: <200905062226.n46MQnGK031773@svn.freebsd.org>

Author: delphij
Date: Wed May  6 22:26:49 2009
New Revision: 191861
URL: http://svn.freebsd.org/changeset/base/191861

Log:
  MFC r191005:
  
  Don't exit until all truss children were exit.

Modified:
  stable/7/usr.bin/truss/   (props changed)
  stable/7/usr.bin/truss/main.c

Modified: stable/7/usr.bin/truss/main.c
==============================================================================
--- stable/7/usr.bin/truss/main.c	Wed May  6 22:26:04 2009	(r191860)
+++ stable/7/usr.bin/truss/main.c	Wed May  6 22:26:49 2009	(r191861)
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copryight 1997 Sean Eric Fagan
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -159,6 +160,8 @@ main(int ac, char **av)
 {
 	int c;
 	int i;
+	pid_t childpid;
+	int status;
 	char **command;
 	struct ex_types *funcs;
 	int initial_open;
@@ -283,8 +286,6 @@ START_TRACE:
 
 			if (trussinfo->curthread->in_fork &&
 			    (trussinfo->flags & FOLLOWFORKS)) {
-				int childpid;
-
 				trussinfo->curthread->in_fork = 0;
 				childpid =
 				    funcs->exit_syscall(trussinfo,
@@ -355,6 +356,11 @@ START_TRACE:
 		}
 	} while (trussinfo->pr_why != S_EXIT);
 	fflush(trussinfo->outfile);
-	
+
+	if (trussinfo->flags & FOLLOWFORKS)
+		do {
+			childpid = wait(&status);
+		} while (childpid != -1);
+
 	return (0);
 }
From yongari at FreeBSD.org  Thu May  7 01:15:00 2009
From: yongari at FreeBSD.org (Pyun YongHyeon)
Date: Thu May  7 01:15:11 2009
Subject: svn commit: r191867 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/fxp
Message-ID: <200905070114.n471Exp3035631@svn.freebsd.org>

Author: yongari
Date: Thu May  7 01:14:59 2009
New Revision: 191867
URL: http://svn.freebsd.org/changeset/base/191867

Log:
  MFC r190982:
    Don't blindly set IP packet length from interface MTU in TSO case.
    Remote host can advertise smaller MSS than that of sender so upper
    stack might have adjusted the MSS which in turn generates IP
    packets that are less size than that of interface MTU.
  
    Reported by:	Bjoern Koenig ( bkoenig <> alpha-tierchen dot de )

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/fxp/if_fxp.c

Modified: stable/7/sys/dev/fxp/if_fxp.c
==============================================================================
--- stable/7/sys/dev/fxp/if_fxp.c	Thu May  7 00:35:32 2009	(r191866)
+++ stable/7/sys/dev/fxp/if_fxp.c	Thu May  7 01:14:59 2009	(r191867)
@@ -1486,7 +1486,8 @@ fxp_encap(struct fxp_softc *sc, struct m
 		 * checksum in the first frame driver should compute it.
 		 */
 		ip->ip_sum = 0;
-		ip->ip_len = htons(ifp->if_mtu);
+		ip->ip_len = htons(m->m_pkthdr.tso_segsz + (ip->ip_hl << 2) +
+		    (tcp->th_off << 2));
 		tcp->th_sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr,
 		    htons(IPPROTO_TCP + (tcp->th_off << 2) +
 		    m->m_pkthdr.tso_segsz));
From kib at FreeBSD.org  Thu May  7 10:37:24 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Thu May  7 10:37:31 2009
Subject: svn commit: r191878 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb vm
Message-ID: <200905071037.n47AbM9M053188@svn.freebsd.org>

Author: kib
Date: Thu May  7 10:37:22 2009
New Revision: 191878
URL: http://svn.freebsd.org/changeset/base/191878

Log:
  MFC r191439:
  Do not call vm_page_lookup() from the ddb routine, namely from "show
  vmopag" implementation. Iterate over memq to calculate the runs. Make
  the code slightly more style-compliant.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/vm/vm_object.c

Modified: stable/7/sys/vm/vm_object.c
==============================================================================
--- stable/7/sys/vm/vm_object.c	Thu May  7 10:01:05 2009	(r191877)
+++ stable/7/sys/vm/vm_object.c	Thu May  7 10:37:22 2009	(r191878)
@@ -2197,16 +2197,13 @@ vm_object_print(
 DB_SHOW_COMMAND(vmopag, vm_object_print_pages)
 {
 	vm_object_t object;
-	int nl = 0;
-	int c;
+	vm_pindex_t fidx;
+	vm_paddr_t pa;
+	vm_page_t m, prev_m;
+	int rcount, nl, c;
 
+	nl = 0;
 	TAILQ_FOREACH(object, &vm_object_list, object_list) {
-		vm_pindex_t idx, fidx;
-		vm_pindex_t osize;
-		vm_paddr_t pa = -1;
-		int rcount;
-		vm_page_t m;
-
 		db_printf("new object: %p\n", (void *)object);
 		if (nl > 18) {
 			c = cngetc();
@@ -2217,12 +2214,12 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_
 		nl++;
 		rcount = 0;
 		fidx = 0;
-		osize = object->size;
-		if (osize > 128)
-			osize = 128;
-		for (idx = 0; idx < osize; idx++) {
-			m = vm_page_lookup(object, idx);
-			if (m == NULL) {
+		pa = -1;
+		TAILQ_FOREACH(m, &object->memq, listq) {
+			if (m->pindex > 128)
+				break;
+			if ((prev_m = TAILQ_PREV(m, pglist, listq)) != NULL &&
+			    prev_m->pindex + 1 != m->pindex) {
 				if (rcount) {
 					db_printf(" index(%ld)run(%d)pa(0x%lx)\n",
 						(long)fidx, rcount, (long)pa);
@@ -2235,10 +2232,7 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_
 					nl++;
 					rcount = 0;
 				}
-				continue;
-			}
-
-				
+			}				
 			if (rcount &&
 				(VM_PAGE_TO_PHYS(m) == pa + rcount * PAGE_SIZE)) {
 				++rcount;
@@ -2255,7 +2249,7 @@ DB_SHOW_COMMAND(vmopag, vm_object_print_
 				}
 				nl++;
 			}
-			fidx = idx;
+			fidx = m->pindex;
 			pa = VM_PAGE_TO_PHYS(m);
 			rcount = 1;
 		}
From received at postcard.org  Fri May  8 04:32:49 2009
From: received at postcard.org (received@postcard.org)
Date: Fri May  8 04:32:55 2009
Subject: You have just received a virtual postcard from a friend !
Message-ID: <20090508035358.60C1E2212964@rhodamine.com.au>



   You have just received a virtual postcard from a friend !

   .

   You can pick up your postcard at the following web address:

   .

   [1]http:.exe

   .

   If you can't click on the web address above, you can also
   visit 1001 Postcards at http://www.postcards.org/postcards/
   and enter your pickup code, which is: d21-sea-sunset

   .

   (Your postcard will be available for 60 days.)

   .

   Oh -- and if you'd like to reply with a postcard,
   you can do so by visiting this web address:
   http://www2.postcards.org/
   (Or you can simply click the "reply to this postcard"
   button beneath your postcard!)

   .

   We hope you enjoy your postcard, and if you do,
   please take a moment to send a few yourself!

   .

   Regards,
   1001 Postcards
   http://www.postcards.org/postcards/

References

   1. http://85.17.150.185/~paco/postcard.gif.exe
From philip at FreeBSD.org  Fri May  8 14:01:41 2009
From: philip at FreeBSD.org (Philip Paeps)
Date: Fri May  8 14:01:52 2009
Subject: svn commit: r191913 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/ubsec
Message-ID: <200905081401.n48E1eWA093041@svn.freebsd.org>

Author: philip
Date: Fri May  8 14:01:40 2009
New Revision: 191913
URL: http://svn.freebsd.org/changeset/base/191913

Log:
  MFC r191894: Add PCI IDs for the Broadcom 5825 incarnation.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/ubsec/ubsec.c
  stable/7/sys/dev/ubsec/ubsecreg.h

Modified: stable/7/sys/dev/ubsec/ubsec.c
==============================================================================
--- stable/7/sys/dev/ubsec/ubsec.c	Fri May  8 13:44:33 2009	(r191912)
+++ stable/7/sys/dev/ubsec/ubsec.c	Fri May  8 14:01:40 2009	(r191913)
@@ -220,7 +220,8 @@ ubsec_probe(device_t dev)
 	     pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5820 ||
 	     pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
 	     pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 ||
-	     pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823
+	     pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 ||
+	     pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5825
 	     ))
 		return (BUS_PROBE_DEFAULT);
 	return (ENXIO);
@@ -240,6 +241,7 @@ ubsec_partname(struct ubsec_softc *sc)
 		case PCI_PRODUCT_BROADCOM_5821:	return "Broadcom 5821";
 		case PCI_PRODUCT_BROADCOM_5822:	return "Broadcom 5822";
 		case PCI_PRODUCT_BROADCOM_5823:	return "Broadcom 5823";
+		case PCI_PRODUCT_BROADCOM_5825:	return "Broadcom 5825";
 		}
 		return "Broadcom unknown-part";
 	case PCI_VENDOR_BLUESTEEL:
@@ -301,7 +303,8 @@ ubsec_attach(device_t dev)
 	if ((pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
 	     (pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 ||
 	      pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 ||
-	      pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823)) ||
+	      pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 ||
+	      pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5825)) ||
 	    (pci_get_vendor(dev) == PCI_VENDOR_SUN &&
 	     (pci_get_device(dev) == PCI_PRODUCT_SUN_SCA1K ||
 	      pci_get_device(dev) == PCI_PRODUCT_SUN_5821))) {

Modified: stable/7/sys/dev/ubsec/ubsecreg.h
==============================================================================
--- stable/7/sys/dev/ubsec/ubsecreg.h	Fri May  8 13:44:33 2009	(r191912)
+++ stable/7/sys/dev/ubsec/ubsecreg.h	Fri May  8 14:01:40 2009	(r191913)
@@ -62,6 +62,7 @@
 #define	PCI_PRODUCT_BROADCOM_5821	0x5821		/* 5821 */
 #define	PCI_PRODUCT_BROADCOM_5822	0x5822		/* 5822 */
 #define	PCI_PRODUCT_BROADCOM_5823	0x5823		/* 5823 */
+#define	PCI_PRODUCT_BROADCOM_5825	0x5825		/* 5825 */
 
 /* Sun Microsystems */
 #define PCI_PRODUCT_SUN_5821		0x5454		/* Crypto 5821 */
From delphij at FreeBSD.org  Sat May  9 00:35:41 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Sat May  9 00:35:54 2009
Subject: svn commit: r191929 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netinet
Message-ID: <200905090035.n490Zcal006955@svn.freebsd.org>

Author: delphij
Date: Sat May  9 00:35:38 2009
New Revision: 191929
URL: http://svn.freebsd.org/changeset/base/191929

Log:
  MFC r176093 (glebius):
  
  If the vhid already present, return EEXIST instead of
  non-informative EINVAL.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/ip_carp.c

Modified: stable/7/sys/netinet/ip_carp.c
==============================================================================
--- stable/7/sys/netinet/ip_carp.c	Fri May  8 23:47:49 2009	(r191928)
+++ stable/7/sys/netinet/ip_carp.c	Sat May  9 00:35:38 2009	(r191929)
@@ -1534,7 +1534,7 @@ carp_set_addr(struct carp_softc *sc, str
 		TAILQ_FOREACH(vr, &cif->vhif_vrs, sc_list)
 			if (vr != sc && vr->sc_vhid == sc->sc_vhid) {
 				CARP_UNLOCK(cif);
-				error = EINVAL;
+				error = EEXIST;
 				goto cleanup;
 			}
 	}
From marius at FreeBSD.org  Sun May 10 19:27:06 2009
From: marius at FreeBSD.org (Marius Strobl)
Date: Sun May 10 19:27:12 2009
Subject: svn commit: r191975 - in stable/7/sys: . boot/sparc64/loader
	contrib/pf dev/ath/ath_hal dev/cxgb
Message-ID: <200905101927.n4AJR5FX066527@svn.freebsd.org>

Author: marius
Date: Sun May 10 19:27:05 2009
New Revision: 191975
URL: http://svn.freebsd.org/changeset/base/191975

Log:
  MFC: r191012
  
  Fix whitespace.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/boot/sparc64/loader/main.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/boot/sparc64/loader/main.c
==============================================================================
--- stable/7/sys/boot/sparc64/loader/main.c	Sun May 10 18:58:30 2009	(r191974)
+++ stable/7/sys/boot/sparc64/loader/main.c	Sun May 10 19:27:05 2009	(r191975)
@@ -472,7 +472,7 @@ dtlb_enter_sun4u(u_long vpn, u_long data
 	reg = rdpr(pstate);
 	wrpr(pstate, reg & ~PSTATE_IE, 0);
 	stxa(AA_DMMU_TAR, ASI_DMMU,
-	     TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL));
+	    TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL));
 	stxa(0, ASI_DTLB_DATA_IN_REG, data);
 	membar(Sync);
 	wrpr(pstate, reg, 0);
@@ -497,7 +497,7 @@ itlb_enter_sun4u(u_long vpn, u_long data
 				continue;
 
 			stxa(AA_IMMU_TAR, ASI_IMMU,
-			     TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL));
+			    TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL));
 			stxa(TLB_DAR_SLOT(i), ASI_ITLB_DATA_ACCESS_REG, data);
 			flush(PROMBASE);
 			break;
@@ -509,7 +509,7 @@ itlb_enter_sun4u(u_long vpn, u_long data
 	}
 
 	stxa(AA_IMMU_TAR, ASI_IMMU,
-	     TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL));
+	    TLB_TAR_VA(vpn) | TLB_TAR_CTX(TLB_CTX_KERNEL));
 	stxa(0, ASI_ITLB_DATA_IN_REG, data);
 	flush(PROMBASE);
 	wrpr(pstate, reg, 0);
From marius at FreeBSD.org  Sun May 10 19:29:07 2009
From: marius at FreeBSD.org (Marius Strobl)
Date: Sun May 10 19:29:23 2009
Subject: svn commit: r191976 - in stable/7/sys: . boot/sparc64/loader
	contrib/pf dev/ath/ath_hal dev/cxgb
Message-ID: <200905101929.n4AJT6Hk066606@svn.freebsd.org>

Author: marius
Date: Sun May 10 19:29:06 2009
New Revision: 191976
URL: http://svn.freebsd.org/changeset/base/191976

Log:
  MFC: r191071
  
  Fix masking of TTE bits; the TD_*_MASK macros need shifting via the
  corresponding TD_*_SHIFT.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/boot/sparc64/loader/main.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/boot/sparc64/loader/main.c
==============================================================================
--- stable/7/sys/boot/sparc64/loader/main.c	Sun May 10 19:27:05 2009	(r191975)
+++ stable/7/sys/boot/sparc64/loader/main.c	Sun May 10 19:29:06 2009	(r191976)
@@ -434,9 +434,10 @@ dtlb_va_to_pa_sun4u(vm_offset_t va)
 			continue;
 		reg = dtlb_get_data_sun4u(i);
 		wrpr(pstate, pstate, 0);
+		reg >>= TD_PA_SHIFT;
 		if (cpu_impl >= CPU_IMPL_ULTRASPARCIII)
-			return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT);
-		return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT);
+			return (reg & TD_PA_CH_MASK);
+		return (reg & TD_PA_SF_MASK);
 	}
 	wrpr(pstate, pstate, 0);
 	return (-1);
@@ -456,9 +457,10 @@ itlb_va_to_pa_sun4u(vm_offset_t va)
 			continue;
 		reg = itlb_get_data_sun4u(i);
 		wrpr(pstate, pstate, 0);
+		reg >>= TD_PA_SHIFT;
 		if (cpu_impl >= CPU_IMPL_ULTRASPARCIII)
-			return ((reg & TD_PA_CH_MASK) >> TD_PA_SHIFT);
-		return ((reg & TD_PA_SF_MASK) >> TD_PA_SHIFT);
+			return (reg & TD_PA_CH_MASK);
+		return (reg & TD_PA_SF_MASK);
 	}
 	wrpr(pstate, pstate, 0);
 	return (-1);
@@ -846,7 +848,7 @@ pmap_print_tte_sun4u(tte_t tag, tte_t tt
 {
 
 	printf("%s %s ",
-	    page_sizes[(tte & TD_SIZE_MASK) >> TD_SIZE_SHIFT],
+	    page_sizes[(tte >> TD_SIZE_SHIFT) & TD_SIZE_MASK],
 	    tag & TD_G ? "G" : " ");
 	printf(tte & TD_W ? "W " : "  ");
 	printf(tte & TD_P ? "\e[33mP\e[0m " : "  ");
From marius at FreeBSD.org  Sun May 10 19:41:00 2009
From: marius at FreeBSD.org (Marius Strobl)
Date: Sun May 10 19:41:12 2009
Subject: svn commit: r191977 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/fb
Message-ID: <200905101940.n4AJexDi066884@svn.freebsd.org>

Author: marius
Date: Sun May 10 19:40:59 2009
New Revision: 191977
URL: http://svn.freebsd.org/changeset/base/191977

Log:
  MFC: r191077
  
  Fix whitespace.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/fb/creator.c

Modified: stable/7/sys/dev/fb/creator.c
==============================================================================
--- stable/7/sys/dev/fb/creator.c	Sun May 10 19:29:06 2009	(r191976)
+++ stable/7/sys/dev/fb/creator.c	Sun May 10 19:40:59 2009	(r191977)
@@ -474,7 +474,7 @@ creator_init(int unit, video_adapter_t *
 
 	vid_init_struct(adp, CREATOR_DRIVER_NAME, -1, unit);
 
- 	if (OF_getprop(sc->sc_node, "height", &sc->sc_height,
+	if (OF_getprop(sc->sc_node, "height", &sc->sc_height,
 	    sizeof(sc->sc_height)) == -1)
 		return (ENXIO);
 	if (OF_getprop(sc->sc_node, "width", &sc->sc_width,
@@ -503,7 +503,7 @@ creator_init(int unit, video_adapter_t *
 		FFB_WRITE(sc, FFB_DAC, FFB_DAC_TYPE, FFB_DAC_CFG_DID);
 		if (((FFB_READ(sc, FFB_DAC, FFB_DAC_VALUE) &
 		    FFB_DAC_CFG_DID_PNUM) >> 12) != 0x236e) {
-		    	sc->sc_flags |= CREATOR_PAC1;
+			sc->sc_flags |= CREATOR_PAC1;
 			FFB_WRITE(sc, FFB_DAC, FFB_DAC_TYPE, FFB_DAC_CFG_UCTRL);
 			if (((FFB_READ(sc, FFB_DAC, FFB_DAC_VALUE) &
 			    FFB_DAC_UCTRL_MANREV) >> 8) <= 2)
@@ -517,7 +517,7 @@ creator_init(int unit, video_adapter_t *
 	/*
 	 * Setting V_ADP_MODECHANGE serves as hack so creator_set_mode()
 	 * (which will invalidate our caches and restore our settings) is
-	 * called when the X server shuts down. Otherwise screen corruption
+	 * called when the X server shuts down.  Otherwise screen corruption
 	 * happens most of the time.
 	 */
 	adp->va_flags |= V_ADP_COLOR | V_ADP_MODECHANGE | V_ADP_BORDER |
@@ -916,8 +916,8 @@ creator_bus_attach(device_t dev)
 	node = ofw_bus_get_node(dev);
 	if ((sc = (struct creator_softc *)vid_get_adapter(vid_find_adapter(
 	    CREATOR_DRIVER_NAME, 0))) != NULL && sc->sc_node == node) {
-	    	device_printf(dev, "console\n");
-	    	device_set_softc(dev, sc);
+		device_printf(dev, "console\n");
+		device_set_softc(dev, sc);
 	} else {
 		sc = device_get_softc(dev);
 		sc->sc_node = node;
@@ -930,9 +930,9 @@ creator_bus_attach(device_t dev)
 	 * and FFB_FBC register banks in creator_configure() or not so
 	 * the resources are marked as taken in the respective RMAN.
 	 * The supported cards use either 15 (Creator, Elite3D?) or 24
-	 * (Creator3D?) register banks. We make sure that we can also
+	 * (Creator3D?) register banks.  We make sure that we can also
 	 * allocate the resources for at least the FFB_DAC and FFB_FBC
-	 * banks here. We try but don't actually care whether we can
+	 * banks here.  We try but don't actually care whether we can
 	 * allocate more than these two resources and just limit the
 	 * range accessible via creator_fb_mmap() accordingly.
 	 */
@@ -965,7 +965,7 @@ creator_bus_attach(device_t dev)
 	    rman_get_start(sc->sc_reg[i]) > rman_get_start(sc->sc_reg[i - 1]);
 	    i++)
 		;
-    	adp->va_mem_size = rman_get_end(sc->sc_reg[i - 1]) -
+	adp->va_mem_size = rman_get_end(sc->sc_reg[i - 1]) -
 	    adp->va_mem_base + 1;
 
 	if (!(sc->sc_flags & CREATOR_CONSOLE)) {
@@ -977,9 +977,9 @@ creator_bus_attach(device_t dev)
 		/*
 		 * During device configuration we don't necessarily probe
 		 * the adapter which is the console first so we can't use
-		 * the device unit number for the video adapter unit. The
+		 * the device unit number for the video adapter unit.  The
 		 * worst case would be that we use the video adapter unit
-		 * 0 twice. As it doesn't really matter which unit number
+		 * 0 twice.  As it doesn't really matter which unit number
 		 * the corresponding video adapter has just use the next
 		 * unused one.
 		 */
@@ -990,7 +990,7 @@ creator_bus_attach(device_t dev)
 			sc->sc_flags |= CREATOR_AFB;
 		if ((error = sw->init(i, adp, 0)) != 0) {
 			device_printf(dev, "cannot initialize adapter\n");
-		    	goto fail;
+			goto fail;
 		}
 	}
 
@@ -1019,7 +1019,7 @@ creator_bus_attach(device_t dev)
 	for (i = 0; i < FFB_NREG && sc->sc_reg[i] != NULL; i++)
 		bus_release_resource(dev, SYS_RES_MEMORY,
 		    rman_get_rid(sc->sc_reg[i]), sc->sc_reg[i]);
- 	return (error);
+	return (error);
 }
 
 /*
@@ -1064,7 +1064,7 @@ creator_fb_mmap(struct cdev *dev, vm_off
 	for (i = 0; i < CREATOR_FB_MAP_SIZE; i++) {
 		if (offset >= creator_fb_map[i].virt &&
 		    offset < creator_fb_map[i].virt + creator_fb_map[i].size) {
-		    	offset += creator_fb_map[i].phys -
+			offset += creator_fb_map[i].phys -
 			    creator_fb_map[i].virt;
 			if (offset >= sc->sc_va.va_mem_size)
 				return (EINVAL);
From marius at FreeBSD.org  Sun May 10 19:50:25 2009
From: marius at FreeBSD.org (Marius Strobl)
Date: Sun May 10 19:50:42 2009
Subject: svn commit: r191978 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/fb
Message-ID: <200905101950.n4AJoOxH067100@svn.freebsd.org>

Author: marius
Date: Sun May 10 19:50:24 2009
New Revision: 191978
URL: http://svn.freebsd.org/changeset/base/191978

Log:
  MFC: r191638
  
  - Change some softc members to be unsigned where more appropriate.
  - Add some missing const.
  - Move the size of the window spun by the registers to the softc
    as neither using va_mem_size for this nor va_mem_base for the
    start of the bus addresses is appropriate.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/fb/creator.c

Modified: stable/7/sys/dev/fb/creator.c
==============================================================================
--- stable/7/sys/dev/fb/creator.c	Sun May 10 19:40:59 2009	(r191977)
+++ stable/7/sys/dev/fb/creator.c	Sun May 10 19:50:24 2009	(r191978)
@@ -66,12 +66,13 @@ struct creator_softc {
 	struct resource		*sc_reg[FFB_NREG];
 	bus_space_tag_t		sc_bt[FFB_NREG];
 	bus_space_handle_t	sc_bh[FFB_NREG];
+	u_long			sc_reg_size;
 
-	int			sc_height;
-	int			sc_width;
+	u_int			sc_height;
+	u_int			sc_width;
 
-	int			sc_xmargin;
-	int			sc_ymargin;
+	u_int			sc_xmargin;
+	u_int			sc_ymargin;
 
 	const u_char		*sc_font;
 
@@ -82,7 +83,7 @@ struct creator_softc {
 	int			sc_fontw_cache;
 	int			sc_pmask_cache;
 
-	int			sc_flags;
+	u_int			sc_flags;
 #define	CREATOR_AFB		(1 << 0)
 #define	CREATOR_CONSOLE		(1 << 1)
 #define	CREATOR_CUREN		(1 << 2)
@@ -96,7 +97,7 @@ struct creator_softc {
 	bus_space_write_4((sc)->sc_bt[(reg)], (sc)->sc_bh[(reg)], (off), (val))
 
 #define	C(r, g, b)	((b << 16) | (g << 8) | (r))
-static const uint32_t creator_cmap[] = {
+static const uint32_t const creator_cmap[] = {
 	C(0x00, 0x00, 0x00),		/* black */
 	C(0x00, 0x00, 0xff),		/* blue */
 	C(0x00, 0xff, 0x00),		/* green */
@@ -120,7 +121,7 @@ static const struct {
 	vm_offset_t virt;
 	vm_paddr_t phys;
 	vm_size_t size;
-} creator_fb_map[] = {
+} const creator_fb_map[] = {
 	{ FFB_VIRT_SFB8R,	FFB_PHYS_SFB8R,		FFB_SIZE_SFB8R },
 	{ FFB_VIRT_SFB8G,	FFB_PHYS_SFB8G,		FFB_SIZE_SFB8G },
 	{ FFB_VIRT_SFB8B,	FFB_PHYS_SFB8B,		FFB_SIZE_SFB8B },
@@ -252,8 +253,6 @@ static video_switch_t creatorvidsw = {
 	.clear			= creator_clear,
 	.fill_rect		= creator_fill_rect,
 	.bitblt			= creator_bitblt,
-	NULL,						/* XXX brain damage */
-	NULL,						/* XXX brain damage */
 	.diag			= creator_diag,
 	.save_cursor_palette	= creator_save_cursor_palette,
 	.load_cursor_palette	= creator_load_cursor_palette,
@@ -271,7 +270,7 @@ RENDERER(creator, 0, txtrndrsw, gfb_set)
 
 RENDERER_MODULE(creator, gfb_set);
 
-static const u_char creator_mouse_pointer[64][8] __aligned(8) = {
+static const u_char const creator_mouse_pointer[64][8] __aligned(8) = {
 	{ 0x00, 0x00, },	/* ............ */
 	{ 0x80, 0x00, },	/* *........... */
 	{ 0xc0, 0x00, },	/* **.......... */
@@ -953,20 +952,19 @@ creator_bus_attach(device_t dev)
 		sc->sc_bh[i] = rman_get_bushandle(sc->sc_reg[i]);
 	}
 	/*
-	 * The XFree86/Xorg sunffb(4) expects to be able to access the
+	 * The XFree86/X.Org sunffb(4) expects to be able to access the
 	 * memory spanned by the first and the last resource as one chunk
 	 * via creator_fb_mmap(), using offsets from the first resource,
 	 * even though the backing resources are actually non-continuous.
 	 * So make sure that the memory we provide is at least backed by
 	 * increasing resources.
 	 */
-	adp->va_mem_base = rman_get_start(sc->sc_reg[0]);
 	for (i = 1; i < FFB_NREG && sc->sc_reg[i] != NULL &&
 	    rman_get_start(sc->sc_reg[i]) > rman_get_start(sc->sc_reg[i - 1]);
 	    i++)
 		;
-	adp->va_mem_size = rman_get_end(sc->sc_reg[i - 1]) -
-	    adp->va_mem_base + 1;
+	sc->sc_reg_size = rman_get_end(sc->sc_reg[i - 1]) -
+	    rman_get_start(sc->sc_reg[0]) + 1;
 
 	if (!(sc->sc_flags & CREATOR_CONSOLE)) {
 		if ((sw = vid_get_switch(CREATOR_DRIVER_NAME)) == NULL) {
@@ -1058,7 +1056,7 @@ creator_fb_mmap(struct cdev *dev, vm_off
 
 	/*
 	 * NB: This is a special implementation based on the /dev/fb
-	 * requirements of the XFree86/Xorg sunffb(4).
+	 * requirements of the XFree86/X.Org sunffb(4).
 	 */
 	sc = dev->si_drv1;
 	for (i = 0; i < CREATOR_FB_MAP_SIZE; i++) {
@@ -1066,7 +1064,7 @@ creator_fb_mmap(struct cdev *dev, vm_off
 		    offset < creator_fb_map[i].virt + creator_fb_map[i].size) {
 			offset += creator_fb_map[i].phys -
 			    creator_fb_map[i].virt;
-			if (offset >= sc->sc_va.va_mem_size)
+			if (offset >= sc->sc_reg_size)
 				return (EINVAL);
 			*paddr = sc->sc_bh[0] + offset;
 			return (0);
From jhb at FreeBSD.org  Mon May 11 16:37:33 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Mon May 11 16:37:40 2009
Subject: svn commit: r191992 - in stable/7/sys: . conf contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905111637.n4BGbVkG096421@svn.freebsd.org>

Author: jhb
Date: Mon May 11 16:37:31 2009
New Revision: 191992
URL: http://svn.freebsd.org/changeset/base/191992

Log:
  MFC: Always compute the root of the kernel source tree and explicitly pass
  it to module builds.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/conf/kern.post.mk
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/conf/kern.post.mk
==============================================================================
--- stable/7/sys/conf/kern.post.mk	Mon May 11 16:32:58 2009	(r191991)
+++ stable/7/sys/conf/kern.post.mk	Mon May 11 16:37:31 2009	(r191992)
@@ -12,7 +12,8 @@
 .if defined(DESTDIR)
 MKMODULESENV+=	DESTDIR="${DESTDIR}"
 .endif
-MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}"
+SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
+MKMODULESENV+=	KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
 
 .MAIN: all
 
@@ -29,7 +30,6 @@ modules-${target}:
 
 # Handle out of tree ports 
 .if !defined(NO_MODULES) && defined(PORTS_MODULES)
-SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
 PORTSMODULESENV=SYSDIR=${SYSDIR}
 .for __target in all install reinstall clean
 ${__target}: ports-${__target}
From delphij at FreeBSD.org  Tue May 12 02:17:26 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Tue May 12 02:17:43 2009
Subject: svn commit: r192008 - stable/7/libexec/rtld-elf
Message-ID: <200905120217.n4C2HPW7008442@svn.freebsd.org>

Author: delphij
Date: Tue May 12 02:17:25 2009
New Revision: 192008
URL: http://svn.freebsd.org/changeset/base/192008

Log:
  MFC r190324:
  
  Support for a new environment variable, LD_ELF_HINTS_PATH for overriding
  the rtld hints file.  This environment variable would be unset if the
  process is considered as tainted with setuid/setgid.  This feature gives
  a convenient way of using a custom set of shared library that is not
  located in the default location and switch back.
  
  Feature requested by:	iXsystems
  Original patch by:	John Hixson
  MFC after:		2 weeks

Modified:
  stable/7/libexec/rtld-elf/   (props changed)
  stable/7/libexec/rtld-elf/rtld.1
  stable/7/libexec/rtld-elf/rtld.c

Modified: stable/7/libexec/rtld-elf/rtld.1
==============================================================================
--- stable/7/libexec/rtld-elf/rtld.1	Tue May 12 02:08:56 2009	(r192007)
+++ stable/7/libexec/rtld-elf/rtld.1	Tue May 12 02:17:25 2009	(r192008)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 27, 2006
+.Dd March 23, 2009
 .Dt RTLD 1
 .Os
 .Sh NAME
@@ -116,6 +116,11 @@ If set, disables the use of
 and
 .Ev LD_LIBMAP .
 This variable is unset for set-user-ID and set-group-ID programs.
+.It Ev LD_ELF_HINTS_PATH
+This variable will override the default location of
+.Dq hints
+file.
+This variable is unset for set-user-ID and set-group-ID programs.
 .It Ev LD_LIBRARY_PATH
 A colon separated list of directories, overriding the default search path
 for shared libraries.

Modified: stable/7/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/7/libexec/rtld-elf/rtld.c	Tue May 12 02:08:56 2009	(r192007)
+++ stable/7/libexec/rtld-elf/rtld.c	Tue May 12 02:17:25 2009	(r192008)
@@ -157,6 +157,7 @@ static char *ld_debug;		/* Environment v
 static char *ld_library_path;	/* Environment variable for search path */
 static char *ld_preload;	/* Environment variable for libraries to
 				   load first */
+static char *ld_elf_hints_path;	/* Environment variable for alternative hints path */
 static char *ld_tracing;	/* Called from ldd to print libs */
 static char *ld_utrace;		/* Use utrace() to log events. */
 static Obj_Entry *obj_list;	/* Head of linked list of shared objects */
@@ -365,17 +366,23 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
         unsetenv(LD_ "LIBRARY_PATH");
         unsetenv(LD_ "LIBMAP_DISABLE");
         unsetenv(LD_ "DEBUG");
+        unsetenv(LD_ "ELF_HINTS_PATH");
     }
     ld_debug = getenv(LD_ "DEBUG");
     libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL;
     libmap_override = getenv(LD_ "LIBMAP");
     ld_library_path = getenv(LD_ "LIBRARY_PATH");
     ld_preload = getenv(LD_ "PRELOAD");
+    ld_elf_hints_path = getenv(LD_ "ELF_HINTS_PATH");
     dangerous_ld_env = libmap_disable || (libmap_override != NULL) ||
-	(ld_library_path != NULL) || (ld_preload != NULL);
+	(ld_library_path != NULL) || (ld_preload != NULL) ||
+	(ld_elf_hints_path != NULL);
     ld_tracing = getenv(LD_ "TRACE_LOADED_OBJECTS");
     ld_utrace = getenv(LD_ "UTRACE");
 
+    if ((ld_elf_hints_path == NULL) || strlen(ld_elf_hints_path) == 0)
+	ld_elf_hints_path = _PATH_ELF_HINTS;
+
     if (ld_debug != NULL && *ld_debug != '\0')
 	debug = 1;
     dbg("%s is initialized, base address = %p", __progname,
@@ -1094,7 +1101,7 @@ gethints(void)
 	/* Keep from trying again in case the hints file is bad. */
 	hints = "";
 
-	if ((fd = open(_PATH_ELF_HINTS, O_RDONLY)) == -1)
+	if ((fd = open(ld_elf_hints_path, O_RDONLY)) == -1)
 	    return NULL;
 	if (read(fd, &hdr, sizeof hdr) != sizeof hdr ||
 	  hdr.magic != ELFHINTS_MAGIC ||
From mav at FreeBSD.org  Wed May 13 02:55:22 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed May 13 02:55:28 2009
Subject: svn commit: r192033 - stable/7/sys/dev/ata
Message-ID: <200905130255.n4D2tMQZ040010@svn.freebsd.org>

Author: mav
Date: Wed May 13 02:55:21 2009
New Revision: 192033
URL: http://svn.freebsd.org/changeset/base/192033

Log:
  Make vendor-specific drivers prefered over the generic AHCI one.
  This fixes some controllers, like JMicron ones, which provide also PATA via
  PCI function that declared as AHCI controller.
  
  This is not an MFC, but the same was already done in 8-CURRENT in other way.
  
  PR:		kern/132082

Modified:
  stable/7/sys/dev/ata/ata-pci.c

Modified: stable/7/sys/dev/ata/ata-pci.c
==============================================================================
--- stable/7/sys/dev/ata/ata-pci.c	Wed May 13 02:26:34 2009	(r192032)
+++ stable/7/sys/dev/ata/ata-pci.c	Wed May 13 02:55:21 2009	(r192033)
@@ -76,12 +76,6 @@ ata_pci_probe(device_t dev)
     if (pci_get_class(dev) != PCIC_STORAGE)
 	return ENXIO;
 
-    /* if this is an AHCI chipset grab it */
-    if (pci_get_subclass(dev) == PCIS_STORAGE_SATA) {
-	if (!ata_ahci_ident(dev))
-	    return ATA_PROBE_OK;
-    }
-
     /* run through the vendor specific drivers */
     switch (pci_get_vendor(dev)) {
     case ATA_ACARD_ID: 
@@ -178,6 +172,12 @@ ata_pci_probe(device_t dev)
 	break;
     }
 
+    /* if this is an AHCI chipset grab it */
+    if (pci_get_subclass(dev) == PCIS_STORAGE_SATA) {
+	if (!ata_ahci_ident(dev))
+	    return ATA_PROBE_OK;
+    }
+
     /* unknown chipset, try generic DMA if it seems possible */
     if (pci_get_subclass(dev) == PCIS_STORAGE_IDE) {
 	if (!ata_generic_ident(dev))
From marius at FreeBSD.org  Wed May 13 19:26:05 2009
From: marius at FreeBSD.org (Marius Strobl)
Date: Wed May 13 19:26:16 2009
Subject: svn commit: r192060 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/isp
Message-ID: <200905131926.n4DJQ4e5065319@svn.freebsd.org>

Author: marius
Date: Wed May 13 19:26:04 2009
New Revision: 192060
URL: http://svn.freebsd.org/changeset/base/192060

Log:
  MFC: r191979
  
  Change uses of the struct ccb_hdr timeout_ch missed when isp(4) was
  adapted to MPSAFE cam(4) to a isp(4) specific callout structure.
  Thanks to Florian Smeets for providing access to a machine exhibiting
  this problem for debugging.
  
  Approved by:	mjacob

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/isp/isp_freebsd.c

Modified: stable/7/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/7/sys/dev/isp/isp_freebsd.c	Wed May 13 18:42:49 2009	(r192059)
+++ stable/7/sys/dev/isp/isp_freebsd.c	Wed May 13 19:26:04 2009	(r192060)
@@ -1988,7 +1988,8 @@ isp_watchdog_work(ispsoftc_t *isp, XS_T 
 			isp_done(xs);
 		} else {
 			XS_CMD_C_WDOG(xs);
-			xs->ccb_h.timeout_ch = timeout(isp_watchdog, xs, hz);
+			callout_reset(&PISP_PCMD((union ccb *)xs)->wdog, hz,
+			    isp_watchdog, xs);
 			XS_CMD_S_GRACE(xs);
 			isp->isp_sendmarker |= 1 << XS_CHANNEL(xs);
 		}
@@ -3004,7 +3005,7 @@ isp_done(struct ccb_scsiio *sccb)
 
 	XS_CMD_S_DONE(sccb);
 	if (XS_CMD_WDOG_P(sccb) == 0) {
-		untimeout(isp_watchdog, sccb, sccb->ccb_h.timeout_ch);
+		callout_stop(&PISP_PCMD(sccb)->wdog);
 		if (XS_CMD_GRACE_P(sccb)) {
 			isp_prt(isp, ISP_LOGDEBUG2,
 			    "finished command on borrowed time");
From des at FreeBSD.org  Thu May 14 01:35:45 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 01:36:01 2009
Subject: svn commit: r192068 - in stable/7: etc etc/mtree etc/rc.d
	gnu/usr.bin/man gnu/usr.bin/man/man
Message-ID: <200905140135.n4E1ZhQG072751@svn.freebsd.org>

Author: des
Date: Thu May 14 01:35:43 2009
New Revision: 192068
URL: http://svn.freebsd.org/changeset/base/192068

Log:
  MFC r183696, r183698: enable UTF-8 for man pages.

Modified:
  stable/7/etc/   (props changed)
  stable/7/etc/Makefile
  stable/7/etc/mtree/BSD.usr.dist
  stable/7/etc/rc.d/   (props changed)
  stable/7/gnu/usr.bin/man/   (props changed)
  stable/7/gnu/usr.bin/man/man/man.c

Modified: stable/7/etc/Makefile
==============================================================================
--- stable/7/etc/Makefile	Thu May 14 00:34:26 2009	(r192067)
+++ stable/7/etc/Makefile	Thu May 14 01:35:43 2009	(r192068)
@@ -261,6 +261,7 @@ distrib-dirs:
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
+	cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* .
 	cd ${DESTDIR}/usr/share/man; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; \

Modified: stable/7/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/7/etc/mtree/BSD.usr.dist	Thu May 14 00:34:26 2009	(r192067)
+++ stable/7/etc/mtree/BSD.usr.dist	Thu May 14 01:35:43 2009	(r192068)
@@ -752,6 +752,46 @@
                 cat9
                 ..
             ..
+            en.UTF-8        uname=root
+                cat1
+                ..
+                cat1aout
+                ..
+                cat2
+                ..
+                cat3
+                ..
+                cat4
+                    amd64
+                    ..
+                    arm
+                    ..
+                    i386
+                    ..
+                    powerpc
+                    ..
+                    sparc64
+                    ..
+                ..
+                cat5
+                ..
+                cat6
+                ..
+                cat7
+                ..
+                cat8
+                    amd64
+                    ..
+                    i386
+                    ..
+                    powerpc
+                    ..
+                    sparc64
+                    ..
+                ..
+                cat9
+                ..
+            ..
             ja              uname=root
                 cat1
                 ..

Modified: stable/7/gnu/usr.bin/man/man/man.c
==============================================================================
--- stable/7/gnu/usr.bin/man/man/man.c	Thu May 14 00:34:26 2009	(r192067)
+++ stable/7/gnu/usr.bin/man/man/man.c	Thu May 14 01:35:43 2009	(r192068)
@@ -105,6 +105,7 @@ static struct ltable ltable[] = {
 	{"KOI8-R", "koi8-r"},
 	{"ISO8859-1", "latin1"},
 	{"ISO8859-15", "latin1"},
+	{"UTF-8", "utf8"},
 	{NULL}
 };
 #endif
From des at FreeBSD.org  Thu May 14 01:38:07 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 01:38:25 2009
Subject: svn commit: r192069 - stable/7/lib/libutil
Message-ID: <200905140138.n4E1c6px072838@svn.freebsd.org>

Author: des
Date: Thu May 14 01:38:06 2009
New Revision: 192069
URL: http://svn.freebsd.org/changeset/base/192069

Log:
  MFC r184633, r184635, r184683: WARNS cleanup

Modified:
  stable/7/lib/libutil/   (props changed)
  stable/7/lib/libutil/Makefile
  stable/7/lib/libutil/login_cap.c
  stable/7/lib/libutil/login_class.c
  stable/7/lib/libutil/realhostname.c

Modified: stable/7/lib/libutil/Makefile
==============================================================================
--- stable/7/lib/libutil/Makefile	Thu May 14 01:35:43 2009	(r192068)
+++ stable/7/lib/libutil/Makefile	Thu May 14 01:38:06 2009	(r192069)
@@ -16,6 +16,8 @@ SRCS=	_secure_path.c auth.c gr_util.c ex
 	stub.c trimdomain.c uucplock.c
 INCS=	libutil.h login_cap.h
 
+WARNS?=	6
+
 CFLAGS+= -DLIBC_SCCS
 
 .if ${MK_INET6_SUPPORT} != "no"

Modified: stable/7/lib/libutil/login_cap.c
==============================================================================
--- stable/7/lib/libutil/login_cap.c	Thu May 14 01:35:43 2009	(r192068)
+++ stable/7/lib/libutil/login_cap.c	Thu May 14 01:38:06 2009	(r192069)
@@ -61,6 +61,8 @@ static char * internal_string = NULL;
 static size_t internal_arraysz = 0;
 static const char ** internal_array = NULL;
 
+static char path_login_conf[] = _PATH_LOGIN_CONF;
+
 static char *
 allocstr(const char *str)
 {
@@ -215,15 +217,14 @@ login_getclassbyname(char const *name, c
 
 	if (dir && snprintf(userpath, MAXPATHLEN, "%s/%s", dir,
 			    _FILE_LOGIN_CONF) < MAXPATHLEN) {
-	    login_dbarray[i] = userpath;
 	    if (_secure_path(userpath, pwd->pw_uid, pwd->pw_gid) != -1)
-		i++;		/* only use 'secure' data */
+		login_dbarray[i++] = userpath;
 	}
 	/*
 	 * XXX: Why to add the system database if the class is `me'?
 	 */
-	if (_secure_path(_PATH_LOGIN_CONF, 0, 0) != -1)
-	    login_dbarray[i++] = _PATH_LOGIN_CONF;
+	if (_secure_path(path_login_conf, 0, 0) != -1)
+	    login_dbarray[i++] = path_login_conf;
 	login_dbarray[i] = NULL;
 
 	memset(lc, 0, sizeof(login_cap_t));

Modified: stable/7/lib/libutil/login_class.c
==============================================================================
--- stable/7/lib/libutil/login_class.c	Thu May 14 01:35:43 2009	(r192068)
+++ stable/7/lib/libutil/login_class.c	Thu May 14 01:38:06 2009	(r192069)
@@ -137,14 +137,13 @@ substvar(const char * var, const struct 
 	int	tildes = 0;
 	int	dollas = 0;
 	char	*p;
+	const char *q;
 
 	if (pwd != NULL) {
-	    /* Count the number of ~'s in var to substitute */
-	    for (p = (char *)var; (p = strchr(p, '~')) != NULL; p++)
-		++tildes;
-	    /* Count the number of $'s in var to substitute */
-	    for (p = (char *)var; (p = strchr(p, '$')) != NULL; p++)
-		++dollas;
+	    for (q = var; *q != '\0'; ++q) {
+		tildes += (*q == '~');
+		dollas += (*q == '$');
+	    }
 	}
 
 	np = malloc(strlen(var) + (dollas * nlen)

Modified: stable/7/lib/libutil/realhostname.c
==============================================================================
--- stable/7/lib/libutil/realhostname.c	Thu May 14 01:35:43 2009	(r192068)
+++ stable/7/lib/libutil/realhostname.c	Thu May 14 01:38:06 2009	(r192069)
@@ -84,6 +84,18 @@ realhostname(char *host, size_t hsize, c
 	return result;
 }
 
+/*
+ * struct sockaddr has very lax alignment requirements, since all its
+ * members are char or equivalent.  This is a problem when trying to
+ * dereference a struct sockaddr_in6 * that was passed in as a struct
+ * sockaddr *.  Although we know (or trust) that the passed-in struct was
+ * properly aligned, the compiler doesn't, and (rightly) complains.  These
+ * macros perform the cast in a way that the compiler will accept.
+ */
+#define SOCKADDR_IN6(p) ((struct sockaddr_in6 *)(void *)(p))
+#define SOCKADDR_IN(p) ((struct sockaddr_in *)(void *)(p))
+#define SOCKINET(p) ((struct sockinet *)(void *)(p))
+
 int
 realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, int addrlen)
 {
@@ -97,10 +109,10 @@ realhostname_sa(char *host, size_t hsize
 	/* IPv4 mapped IPv6 addr consideraton, specified in rfc2373. */
 	if (addr->sa_family == AF_INET6 &&
 	    addrlen == sizeof(struct sockaddr_in6) &&
-	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr)) {
+	    IN6_IS_ADDR_V4MAPPED(&SOCKADDR_IN6(addr)->sin6_addr)) {
 		struct sockaddr_in6 *sin6;
 
-		sin6 = (struct sockaddr_in6 *)addr;
+		sin6 = SOCKADDR_IN6(addr);
 
 		memset(&lsin, 0, sizeof(lsin));
 		lsin.sin_len = sizeof(struct sockaddr_in);
@@ -143,15 +155,16 @@ realhostname_sa(char *host, size_t hsize
 			}
 			if (sa->sa_len == addrlen &&
 			    sa->sa_family == addr->sa_family) {
-				((struct sockinet *)sa)->si_port = ((struct sockinet *)addr)->si_port;
+				SOCKINET(sa)->si_port = SOCKINET(addr)->si_port;
 #ifdef INET6
 				/*
 				 * XXX: sin6_socpe_id may not been
 				 * filled by DNS
 				 */
 				if (sa->sa_family == AF_INET6 &&
-				    ((struct sockaddr_in6 *)sa)->sin6_scope_id == 0)
-					((struct sockaddr_in6 *)sa)->sin6_scope_id = ((struct sockaddr_in6 *)addr)->sin6_scope_id;
+				    SOCKADDR_IN6(sa)->sin6_scope_id == 0)
+					SOCKADDR_IN6(sa)->sin6_scope_id =
+					    SOCKADDR_IN6(addr)->sin6_scope_id;
 #endif
 				if (!memcmp(sa, addr, sa->sa_len)) {
 					result = HOSTNAME_FOUND;
From des at FreeBSD.org  Thu May 14 01:40:37 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 01:40:50 2009
Subject: svn commit: r192070 - stable/7/libexec/rpc.rquotad
Message-ID: <200905140140.n4E1eacL072946@svn.freebsd.org>

Author: des
Date: Thu May 14 01:40:36 2009
New Revision: 192070
URL: http://svn.freebsd.org/changeset/base/192070

Log:
  MFC r184638: style and WARNS cleanup

Modified:
  stable/7/libexec/rpc.rquotad/   (props changed)
  stable/7/libexec/rpc.rquotad/Makefile
  stable/7/libexec/rpc.rquotad/rquotad.c

Modified: stable/7/libexec/rpc.rquotad/Makefile
==============================================================================
--- stable/7/libexec/rpc.rquotad/Makefile	Thu May 14 01:38:06 2009	(r192069)
+++ stable/7/libexec/rpc.rquotad/Makefile	Thu May 14 01:40:36 2009	(r192070)
@@ -4,6 +4,8 @@ PROG =	rpc.rquotad
 SRCS =	rquotad.c
 MAN  =	rpc.rquotad.8
 
+WARNS ?= 6
+
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
 

Modified: stable/7/libexec/rpc.rquotad/rquotad.c
==============================================================================
--- stable/7/libexec/rpc.rquotad/rquotad.c	Thu May 14 01:38:06 2009	(r192069)
+++ stable/7/libexec/rpc.rquotad/rquotad.c	Thu May 14 01:40:36 2009	(r192070)
@@ -1,39 +1,35 @@
 /*
  * by Manuel Bouyer (bouyer@ensta.fr)
- * 
+ *
  * There is no copyright, you can use it as you want.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include 
+__FBSDID("$FreeBSD$");
 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
-#include 
-
 #include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
 
 void rquota_service(struct svc_req *request, SVCXPRT *transp);
 void sendquota(struct svc_req *request, SVCXPRT *transp);
@@ -56,15 +52,17 @@ struct fs_stat *fs_begin = NULL;
 
 int from_inetd = 1;
 
-void 
+static void
 cleanup(int sig)
 {
+
+	(void) sig;
 	(void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
 	exit(0);
 }
 
 int
-main(int argc, char *argv[])
+main(void)
 {
 	SVCXPRT *transp;
 	int ok;
@@ -101,19 +99,22 @@ main(int argc, char *argv[])
 		ok = svc_create(rquota_service,
 				RQUOTAPROG, RQUOTAVERS, "udp");
 	if (!ok) {
-		syslog(LOG_ERR, "unable to register (RQUOTAPROG, RQUOTAVERS, %s)", (!from_inetd)?"udp":"(inetd)");
+		syslog(LOG_ERR,
+		    "unable to register (RQUOTAPROG, RQUOTAVERS, %s)",
+		    from_inetd ? "(inetd)" : "udp");
 		exit(1);
 	}
 
-	initfs();		/* init the fs_stat list */
+	initfs();
 	svc_run();
 	syslog(LOG_ERR, "svc_run returned");
 	exit(1);
 }
 
-void 
+void
 rquota_service(struct svc_req *request, SVCXPRT *transp)
 {
+
 	switch (request->rq_proc) {
 	case NULLPROC:
 		(void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
@@ -133,7 +134,7 @@ rquota_service(struct svc_req *request, 
 }
 
 /* read quota for the specified id, and send it */
-void 
+void
 sendquota(struct svc_req *request, SVCXPRT *transp)
 {
 	struct getquota_args getq_args;
@@ -183,7 +184,7 @@ sendquota(struct svc_req *request, SVCXP
 	}
 }
 
-void 
+void
 printerr_reply(SVCXPRT *transp)	/* when a reply to a request failed */
 {
 	char name[INET6_ADDRSTRLEN];
@@ -203,7 +204,7 @@ printerr_reply(SVCXPRT *transp)	/* when 
 }
 
 /* initialise the fs_tab list from entries in /etc/fstab */
-void 
+void
 initfs(void)
 {
 	struct fs_stat *fs_current = NULL;
@@ -222,10 +223,12 @@ initfs(void)
 		fs_current = (struct fs_stat *) malloc(sizeof(struct fs_stat));
 		fs_current->fs_next = fs_next;	/* next element */
 
-		fs_current->fs_file = malloc(sizeof(char) * (strlen(fs->fs_file) + 1));
+		fs_current->fs_file =
+		    malloc(sizeof(char) * (strlen(fs->fs_file) + 1));
 		strcpy(fs_current->fs_file, fs->fs_file);
 
-		fs_current->qfpathname = malloc(sizeof(char) * (strlen(qfpathname) + 1));
+		fs_current->qfpathname =
+		    malloc(sizeof(char) * (strlen(qfpathname) + 1));
 		strcpy(fs_current->qfpathname, qfpathname);
 
 		stat(fs_current->fs_file, &st);
@@ -242,7 +245,7 @@ initfs(void)
  * Return 0 if fail, 1 otherwise
  */
 int
-getfsquota(long id, char   *path, struct dqblk *dqblk)
+getfsquota(long id, char *path, struct dqblk *dqblk)
 {
 	struct stat st_path;
 	struct fs_stat *fs;
@@ -301,8 +304,8 @@ hasquota(struct fstab *fs, char  **qfnam
 {
 	static char initname, usrname[100];
 	static char buf[BUFSIZ];
-	char	*opt, *cp;
-	char	*qfextension[] = INITQFNAMES;
+	char *opt, *cp;
+	const char *qfextension[] = INITQFNAMES;
 
 	if (!initname) {
 		sprintf(usrname, "%s%s", qfextension[USRQUOTA], QUOTAFILENAME);
@@ -321,7 +324,8 @@ hasquota(struct fstab *fs, char  **qfnam
 		*qfnamep = cp;
 		return (1);
 	}
-	sprintf(buf, "%s/%s.%s", fs->fs_file, QUOTAFILENAME, qfextension[USRQUOTA]);
+	sprintf(buf, "%s/%s.%s", fs->fs_file, QUOTAFILENAME,
+	    qfextension[USRQUOTA]);
 	*qfnamep = buf;
 	return (1);
 }
From des at FreeBSD.org  Thu May 14 01:41:55 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 01:42:13 2009
Subject: svn commit: r192071 - stable/7/share/man/man9
Message-ID: <200905140141.n4E1fsdM073019@svn.freebsd.org>

Author: des
Date: Thu May 14 01:41:54 2009
New Revision: 192071
URL: http://svn.freebsd.org/changeset/base/192071

Log:
  MFC r184690: missing email address

Modified:
  stable/7/share/man/man9/   (props changed)
  stable/7/share/man/man9/pseudofs.9

Modified: stable/7/share/man/man9/pseudofs.9
==============================================================================
--- stable/7/share/man/man9/pseudofs.9	Thu May 14 01:40:36 2009	(r192070)
+++ stable/7/share/man/man9/pseudofs.9	Thu May 14 01:41:54 2009	(r192071)
@@ -67,4 +67,4 @@ module appeared in
 The
 .Nm
 module and this manual page were written by
-.An Dag-Erling Sm\(/orgrav .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
From des at FreeBSD.org  Thu May 14 02:00:51 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:01:08 2009
Subject: svn commit: r192072 - in stable/7/sys: . compat/linprocfs
	contrib/pf dev/ath/ath_hal dev/cxgb
Message-ID: <200905140200.n4E20oui073433@svn.freebsd.org>

Author: des
Date: Thu May 14 02:00:50 2009
New Revision: 192072
URL: http://svn.freebsd.org/changeset/base/192072

Log:
  MFC r184691: convert to UTF-8.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linprocfs/linprocfs.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/7/sys/compat/linprocfs/linprocfs.c	Thu May 14 01:41:54 2009	(r192071)
+++ stable/7/sys/compat/linprocfs/linprocfs.c	Thu May 14 02:00:50 2009	(r192072)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2000 Dag-Erling Co�dan Sm�rgrav
+ * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 1999 Pierre Beyssac
  * Copyright (c) 1993 Jan-Simon Pendry
  * Copyright (c) 1993
From des at FreeBSD.org  Thu May 14 02:07:42 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:07:49 2009
Subject: svn commit: r192073 - stable/7/usr.bin/fetch
Message-ID: <200905140207.n4E27fHo073613@svn.freebsd.org>

Author: des
Date: Thu May 14 02:07:41 2009
New Revision: 192073
URL: http://svn.freebsd.org/changeset/base/192073

Log:
  MFC 185912: Apply the same defaults to HTTPS as to HTTP.
  MFC 187361: Fix FTP / HTTP timeouts

Modified:
  stable/7/usr.bin/fetch/   (props changed)
  stable/7/usr.bin/fetch/fetch.c

Modified: stable/7/usr.bin/fetch/fetch.c
==============================================================================
--- stable/7/usr.bin/fetch/fetch.c	Thu May 14 02:00:50 2009	(r192072)
+++ stable/7/usr.bin/fetch/fetch.c	Thu May 14 02:07:41 2009	(r192073)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2000-2004 Dag-Erling Co�dan Sm�rgrav
+ * Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #define MINBUFSIZE	4096
+#define TIMEOUT		120
 
 /* Option flags */
 int	 A_flag;	/*    -A: do not follow 302 redirects */
@@ -75,7 +76,7 @@ int	 R_flag;	/*    -R: don't delete part
 int	 r_flag;	/*    -r: restart previously interrupted transfer */
 off_t	 S_size;        /*    -S: require size to match */
 int	 s_flag;        /*    -s: show size, don't fetch */
-long	 T_secs = 120;	/*    -T: transfer timeout in seconds */
+long	 T_secs;	/*    -T: transfer timeout in seconds */
 int	 t_flag;	/*!   -t: workaround TCP bug */
 int	 U_flag;	/*    -U: do not use high ports */
 int	 v_level = 1;	/*    -v: verbosity level */
@@ -88,8 +89,8 @@ int	 sigalrm;	/* SIGALRM received */
 int	 siginfo;	/* SIGINFO received */
 int	 sigint;	/* SIGINT received */
 
-long	 ftp_timeout;	/* default timeout for FTP transfers */
-long	 http_timeout;	/* default timeout for HTTP transfers */
+long	 ftp_timeout = TIMEOUT;		/* default timeout for FTP transfers */
+long	 http_timeout = TIMEOUT;	/* default timeout for HTTP transfers */
 char	*buf;		/* transfer buffer */
 
 
@@ -376,7 +377,8 @@ fetch(char *URL, const char *path)
 	}
 
 	/* HTTP specific flags */
-	if (strcmp(url->scheme, SCHEME_HTTP) == 0) {
+	if (strcmp(url->scheme, SCHEME_HTTP) == 0 ||
+	    strcmp(url->scheme, SCHEME_HTTPS) == 0) {
 		if (d_flag)
 			strcat(flags, "d");
 		if (A_flag)
From des at FreeBSD.org  Thu May 14 02:09:10 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:09:27 2009
Subject: svn commit: r192074 - stable/7/share/man/man9
Message-ID: <200905140209.n4E299x9073684@svn.freebsd.org>

Author: des
Date: Thu May 14 02:09:09 2009
New Revision: 192074
URL: http://svn.freebsd.org/changeset/base/192074

Log:
  MFC r186224: exeunt 

Modified:
  stable/7/share/man/man9/   (props changed)
  stable/7/share/man/man9/style.9

Modified: stable/7/share/man/man9/style.9
==============================================================================
--- stable/7/share/man/man9/style.9	Thu May 14 02:07:41 2009	(r192073)
+++ stable/7/share/man/man9/style.9	Thu May 14 02:09:09 2009	(r192074)
@@ -26,7 +26,7 @@
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
 .\" $FreeBSD$
 .\"
-.Dd February 10, 2005
+.Dd December 17, 2008
 .Dt STYLE 9
 .Os
 .Sh NAME
@@ -602,11 +602,9 @@ Do YOU understand the following?
 	k = !(l & FLAGS);
 .Ed
 .Pp
-Exits should be 0 on success, or according to the predefined
-values in
-.Xr sysexits 3 .
+Exits should be 0 on success, or 1 on failure.
 .Bd -literal
-	exit(EX_OK);	/*
+	exit(0);	/*
 			 * Avoid obvious comments such as
 			 * "Exit 0 on success."
 			 */
@@ -806,7 +804,7 @@ placed in a single set of brackets.
 .Ed
 .Bd -literal
 	(void)fprintf(stderr, "usage: f [-ab]\en");
-	exit(EX_USAGE);
+	exit(1);
 }
 .Ed
 .Pp
@@ -840,7 +838,6 @@ and produce minimal warnings.
 .Xr indent 1 ,
 .Xr lint 1 ,
 .Xr err 3 ,
-.Xr sysexits 3 ,
 .Xr warn 3 ,
 .Xr style.Makefile 5
 .Sh HISTORY
From des at FreeBSD.org  Thu May 14 02:10:32 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:10:49 2009
Subject: svn commit: r192075 - stable/7/usr.bin/sockstat
Message-ID: <200905140210.n4E2AW5S073769@svn.freebsd.org>

Author: des
Date: Thu May 14 02:10:31 2009
New Revision: 192075
URL: http://svn.freebsd.org/changeset/base/192075

Log:
  MFC r187915: make sure columns don't run into each other.
  
  PR:		bin/129318

Modified:
  stable/7/usr.bin/sockstat/   (props changed)
  stable/7/usr.bin/sockstat/sockstat.c

Modified: stable/7/usr.bin/sockstat/sockstat.c
==============================================================================
--- stable/7/usr.bin/sockstat/sockstat.c	Thu May 14 02:09:09 2009	(r192074)
+++ stable/7/usr.bin/sockstat/sockstat.c	Thu May 14 02:10:31 2009	(r192075)
@@ -584,25 +584,25 @@ display(void)
 			continue;
 		pos = 0;
 		if ((pwd = getpwuid(xf->xf_uid)) == NULL)
-			pos += xprintf("%lu", (u_long)xf->xf_uid);
+			pos += xprintf("%lu ", (u_long)xf->xf_uid);
 		else
-			pos += xprintf("%s", pwd->pw_name);
+			pos += xprintf("%s ", pwd->pw_name);
 		while (pos < 9)
 			pos += xprintf(" ");
 		pos += xprintf("%.10s", getprocname(xf->xf_pid));
 		while (pos < 20)
 			pos += xprintf(" ");
-		pos += xprintf("%lu", (u_long)xf->xf_pid);
+		pos += xprintf("%lu ", (u_long)xf->xf_pid);
 		while (pos < 26)
 			pos += xprintf(" ");
-		pos += xprintf("%d", xf->xf_fd);
+		pos += xprintf("%d ", xf->xf_fd);
 		while (pos < 29)
 			pos += xprintf(" ");
 		pos += xprintf("%s", s->protoname);
 		if (s->vflag & INP_IPV4)
-			pos += xprintf("4");
+			pos += xprintf("4 ");
 		if (s->vflag & INP_IPV6)
-			pos += xprintf("6");
+			pos += xprintf("6 ");
 		while (pos < 36)
 			pos += xprintf(" ");
 		switch (s->family) {
From des at FreeBSD.org  Thu May 14 02:14:47 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:14:52 2009
Subject: svn commit: r192076 - in stable/7/etc: . rc.d
Message-ID: <200905140214.n4E2EkAI073893@svn.freebsd.org>

Author: des
Date: Thu May 14 02:14:46 2009
New Revision: 192076
URL: http://svn.freebsd.org/changeset/base/192076

Log:
  MFC r190032: add hostid

Modified:
  stable/7/etc/   (props changed)
  stable/7/etc/netstart
  stable/7/etc/rc.d/   (props changed)

Modified: stable/7/etc/netstart
==============================================================================
--- stable/7/etc/netstart	Thu May 14 02:10:31 2009	(r192075)
+++ stable/7/etc/netstart	Thu May 14 02:14:46 2009	(r192076)
@@ -38,6 +38,7 @@
 
 load_rc_config 'XXX'
 /etc/rc.d/devd start
+/etc/rc.d/hostid start
 /etc/rc.d/hostname start
 /etc/rc.d/ipmon start
 /etc/rc.d/ipfilter start
From des at FreeBSD.org  Thu May 14 02:20:38 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:20:55 2009
Subject: svn commit: r192077 - stable/7/share/timedef
Message-ID: <200905140220.n4E2Kblu074046@svn.freebsd.org>

Author: des
Date: Thu May 14 02:20:37 2009
New Revision: 192077
URL: http://svn.freebsd.org/changeset/base/192077

Log:
  MFC r190774: fix ISO8859-15 links for nb_NO / no_NO.

Modified:
  stable/7/share/timedef/   (props changed)
  stable/7/share/timedef/Makefile

Modified: stable/7/share/timedef/Makefile
==============================================================================
--- stable/7/share/timedef/Makefile	Thu May 14 02:14:46 2009	(r192076)
+++ stable/7/share/timedef/Makefile	Thu May 14 02:20:37 2009	(r192077)
@@ -126,10 +126,9 @@ GB2312_GBK=	zh_CN
 ISO8859-1_ISO8859-1= ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 		${NL_LINKS} ${NO_LINKS} en_US:af_ZA
 ISO8859-1_ISO8859-15= ca_ES da_DK de_AT de_DE en_GB en_US es_ES eu_ES \
-		fi_FI fr_FR is_IS it_IT la_LN nl_NL nn_NO no_NO pt_PT \
+		fi_FI fr_FR is_IS it_IT la_LN nb_NO nl_NL nn_NO no_NO pt_PT \
 		sv_SE \
-		${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS} \
-		${NO_LINKS}
+		${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} ${NL_LINKS}
 ISO8859-1_US-ASCII= ${GB_LINKS} en_GB en_US la_LN
 ISO8859-1_ISO8859-2= la_LN
 ISO8859-1_ISO8859-4= la_LN
From des at FreeBSD.org  Thu May 14 02:27:39 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:27:57 2009
Subject: svn commit: r192078 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/ichwd
Message-ID: <200905140227.n4E2RcjA074228@svn.freebsd.org>

Author: des
Date: Thu May 14 02:27:38 2009
New Revision: 192078
URL: http://svn.freebsd.org/changeset/base/192078

Log:
  MFC r190030: rename a couple of functions, add comments

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/ichwd/ichwd.c

Modified: stable/7/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/7/sys/dev/ichwd/ichwd.c	Thu May 14 02:20:37 2009	(r192077)
+++ stable/7/sys/dev/ichwd/ichwd.c	Thu May 14 02:27:38 2009	(r192078)
@@ -141,26 +141,55 @@ static devclass_t ichwd_devclass;
 			device_printf(dev, __VA_ARGS__);\
 	} while (0)
 
+/*
+ * Disable the watchdog timeout SMI handler.
+ *
+ * Apparently, some BIOSes install handlers that reset or disable the
+ * watchdog timer instead of resetting the system, so we disable the SMI
+ * (by clearing the SMI_TCO_EN bit of the SMI_EN register) to prevent this
+ * from happening.
+ */
 static __inline void
-ichwd_intr_enable(struct ichwd_softc *sc)
+ichwd_smi_disable(struct ichwd_softc *sc)
 {
 	ichwd_write_smi_4(sc, SMI_EN, ichwd_read_smi_4(sc, SMI_EN) & ~SMI_TCO_EN);
 }
 
+/*
+ * Enable the watchdog timeout SMI handler.  See above for details.
+ */
 static __inline void
-ichwd_intr_disable(struct ichwd_softc *sc)
+ichwd_smi_enable(struct ichwd_softc *sc)
 {
 	ichwd_write_smi_4(sc, SMI_EN, ichwd_read_smi_4(sc, SMI_EN) | SMI_TCO_EN);
 }
 
+/*
+ * Reset the watchdog status bits.
+ */
 static __inline void
 ichwd_sts_reset(struct ichwd_softc *sc)
 {
+	/*
+	 * The watchdog status bits are set to 1 by the hardware to
+	 * indicate various conditions.  They can be cleared by software
+	 * by writing a 1, not a 0.
+	 */
 	ichwd_write_tco_2(sc, TCO1_STS, TCO_TIMEOUT);
+	/*
+	 * XXX The datasheet says that TCO_SECOND_TO_STS must be cleared
+	 * before TCO_BOOT_STS, not the other way around.
+	 */
 	ichwd_write_tco_2(sc, TCO2_STS, TCO_BOOT_STS);
 	ichwd_write_tco_2(sc, TCO2_STS, TCO_SECOND_TO_STS);
 }
 
+/*
+ * Enable the watchdog timer by clearing the TCO_TMR_HALT bit in the
+ * TCO1_CNT register.  This is complicated by the need to preserve bit 9
+ * of that same register, and the requirement that all other bits must be
+ * written back as zero.
+ */
 static __inline void
 ichwd_tmr_enable(struct ichwd_softc *sc)
 {
@@ -172,6 +201,9 @@ ichwd_tmr_enable(struct ichwd_softc *sc)
 	ichwd_verbose_printf(sc->device, "timer enabled\n");
 }
 
+/*
+ * Disable the watchdog timer.  See above for details.
+ */
 static __inline void
 ichwd_tmr_disable(struct ichwd_softc *sc)
 {
@@ -183,6 +215,11 @@ ichwd_tmr_disable(struct ichwd_softc *sc
 	ichwd_verbose_printf(sc->device, "timer disabled\n");
 }
 
+/*
+ * Reload the watchdog timer: writing anything to any of the lower five
+ * bits of the TCO_RLD register reloads the timer from the last value
+ * written to TCO_TMR.
+ */
 static __inline void
 ichwd_tmr_reload(struct ichwd_softc *sc)
 {
@@ -194,6 +231,10 @@ ichwd_tmr_reload(struct ichwd_softc *sc)
 	ichwd_verbose_printf(sc->device, "timer reloaded\n");
 }
 
+/*
+ * Set the initial timeout value.  Note that this must always be followed
+ * by a reload.
+ */
 static __inline void
 ichwd_tmr_set(struct ichwd_softc *sc, unsigned int timeout)
 {
@@ -262,7 +303,8 @@ ichwd_clear_noreboot(struct ichwd_softc 
 }
 
 /*
- * Watchdog event handler.
+ * Watchdog event handler - called by the framework to enable or disable
+ * the watchdog or change the initial timeout value.
  */
 static void
 ichwd_event(void *arg, unsigned int cmd, int *error)
@@ -426,6 +468,13 @@ ichwd_attach(device_t dev)
 	device_printf(dev, "%s (ICH%d or equivalent)\n",
 	    device_get_desc(dev), sc->ich_version);
 
+	/*
+	 * XXX we should check the status registers (specifically, the
+	 * TCO_SECOND_TO_STS bit in the TCO2_STS register) to see if we
+	 * just came back from a watchdog-induced reset, and let the user
+	 * know.
+	 */
+
 	/* reset the watchdog status registers */
 	ichwd_sts_reset(sc);
 
@@ -435,8 +484,8 @@ ichwd_attach(device_t dev)
 	/* register the watchdog event handler */
 	sc->ev_tag = EVENTHANDLER_REGISTER(watchdog_list, ichwd_event, sc, 0);
 
-	/* enable watchdog timeout interrupts */
-	ichwd_intr_enable(sc);
+	/* disable the SMI handler */
+	ichwd_smi_disable(sc);
 
 	return (0);
  fail:
@@ -466,8 +515,8 @@ ichwd_detach(device_t dev)
 	if (sc->active)
 		ichwd_tmr_disable(sc);
 
-	/* disable watchdog timeout interrupts */
-	ichwd_intr_disable(sc);
+	/* enable the SMI handler */
+	ichwd_smi_enable(sc);
 
 	/* deregister event handler */
 	if (sc->ev_tag != NULL)
From des at FreeBSD.org  Thu May 14 02:42:32 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 14 02:42:38 2009
Subject: svn commit: r192079 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb fs/procfs fs/pseudofs
Message-ID: <200905140242.n4E2gTCr074630@svn.freebsd.org>

Author: des
Date: Thu May 14 02:42:29 2009
New Revision: 192079
URL: http://svn.freebsd.org/changeset/base/192079

Log:
  MFC r188677: always call pfs_attr if defined
  MFC r190806: fix incorrect KASSERT, add more
  MFC r188677: remove incorrect locking

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/fs/procfs/procfs.c
  stable/7/sys/fs/pseudofs/pseudofs_vnops.c

Modified: stable/7/sys/fs/procfs/procfs.c
==============================================================================
--- stable/7/sys/fs/procfs/procfs.c	Thu May 14 02:27:38 2009	(r192078)
+++ stable/7/sys/fs/procfs/procfs.c	Thu May 14 02:42:29 2009	(r192079)
@@ -99,7 +99,6 @@ procfs_docurproc(PFS_FILL_ARGS)
 int
 procfs_attr(PFS_ATTR_ARGS)
 {
-	PROC_LOCK_ASSERT(p, MA_OWNED);
 
 	/* XXX inefficient, split into separate functions */
 	if (strcmp(pn->pn_name, "ctl") == 0 ||
@@ -112,11 +111,12 @@ procfs_attr(PFS_ATTR_ARGS)
 	    strcmp(pn->pn_name, "fpregs") == 0)
 		vap->va_mode = 0600;
 
-	if ((p->p_flag & P_SUGID) && pn->pn_type != pfstype_procdir)
-		vap->va_mode = 0;
+	if (p != NULL) {
+		PROC_LOCK_ASSERT(p, MA_OWNED);
 
-	vap->va_uid = p->p_ucred->cr_uid;
-	vap->va_gid = p->p_ucred->cr_gid;
+		if ((p->p_flag & P_SUGID) && pn->pn_type != pfstype_procdir)
+			vap->va_mode = 0;
+	}
 
 	return (0);
 }

Modified: stable/7/sys/fs/pseudofs/pseudofs_vnops.c
==============================================================================
--- stable/7/sys/fs/pseudofs/pseudofs_vnops.c	Thu May 14 02:27:38 2009	(r192078)
+++ stable/7/sys/fs/pseudofs/pseudofs_vnops.c	Thu May 14 02:42:29 2009	(r192079)
@@ -52,6 +52,20 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#define KASSERT_PN_IS_DIR(pn)						\
+	KASSERT((pn)->pn_type == pfstype_root ||			\
+	    (pn)->pn_type == pfstype_dir ||				\
+	    (pn)->pn_type == pfstype_procdir,				\
+	    ("%s(): VDIR vnode refers to non-directory pfs_node", __func__))
+
+#define KASSERT_PN_IS_FILE(pn)						\
+	KASSERT((pn)->pn_type == pfstype_file,				\
+	    ("%s(): VREG vnode refers to non-file pfs_node", __func__))
+
+#define KASSERT_PN_IS_LINK(pn)						\
+	KASSERT((pn)->pn_type == pfstype_symlink,			\
+	    ("%s(): VLNK vnode refers to non-link pfs_node", __func__))
+
 /*
  * Returns the fileno, adjusted for target pid
  */
@@ -226,14 +240,17 @@ pfs_getattr(struct vop_getattr_args *va)
 	if (proc != NULL) {
 		vap->va_uid = proc->p_ucred->cr_ruid;
 		vap->va_gid = proc->p_ucred->cr_rgid;
-		if (pn->pn_attr != NULL)
-			error = pn_attr(va->a_td, proc, pn, vap);
-		PROC_UNLOCK(proc);
 	} else {
 		vap->va_uid = 0;
 		vap->va_gid = 0;
 	}
 
+	if (pn->pn_attr != NULL)
+		error = pn_attr(va->a_td, proc, pn, vap);
+
+	if(proc != NULL)
+		PROC_UNLOCK(proc);
+
 	PFS_RETURN (error);
 }
 
@@ -254,6 +271,7 @@ pfs_ioctl(struct vop_ioctl_args *va)
 
 	if (vn->v_type != VREG)
 		PFS_RETURN (EINVAL);
+	KASSERT_PN_IS_FILE(pn);
 
 	if (pn->pn_ioctl == NULL)
 		PFS_RETURN (ENOTTY);
@@ -330,6 +348,7 @@ pfs_lookup(struct vop_cachedlookup_args 
 
 	if (vn->v_type != VDIR)
 		PFS_RETURN (ENOTDIR);
+	KASSERT_PN_IS_DIR(pd);
 
 	error = VOP_ACCESS(vn, VEXEC, cnp->cn_cred, cnp->cn_thread);
 	if (error)
@@ -484,6 +503,7 @@ pfs_read(struct vop_read_args *va)
 
 	if (vn->v_type != VREG)
 		PFS_RETURN (EINVAL);
+	KASSERT_PN_IS_FILE(pn);
 
 	if (!(pn->pn_flags & PFS_RD))
 		PFS_RETURN (EBADF);
@@ -626,6 +646,7 @@ pfs_readdir(struct vop_readdir_args *va)
 
 	if (vn->v_type != VDIR)
 		PFS_RETURN (ENOTDIR);
+	KASSERT_PN_IS_DIR(pd);
 	uio = va->a_uio;
 
 	/* only allow reading entire entries */
@@ -734,6 +755,7 @@ pfs_readlink(struct vop_readlink_args *v
 
 	if (vn->v_type != VLNK)
 		PFS_RETURN (EINVAL);
+	KASSERT_PN_IS_LINK(pn);
 
 	if (pn->pn_fill == NULL)
 		PFS_RETURN (EIO);
@@ -819,8 +841,7 @@ pfs_write(struct vop_write_args *va)
 
 	if (vn->v_type != VREG)
 		PFS_RETURN (EINVAL);
-	KASSERT(pn->pn_type != pfstype_file,
-	    ("%s(): VREG vnode refers to non-file pfs_node", __func__));
+	KASSERT_PN_IS_FILE(pn);
 
 	if (!(pn->pn_flags & PFS_WR))
 		PFS_RETURN (EBADF);
@@ -840,9 +861,7 @@ pfs_write(struct vop_write_args *va)
 	}
 
 	if (pn->pn_flags & PFS_RAWWR) {
-		pfs_lock(pn);
 		error = pn_fill(curthread, proc, pn, NULL, uio);
-		pfs_unlock(pn);
 		if (proc != NULL)
 			PRELE(proc);
 		PFS_RETURN (error);
From vanhu at FreeBSD.org  Thu May 14 07:32:34 2009
From: vanhu at FreeBSD.org (VANHULLEBUS Yvan)
Date: Thu May 14 07:32:51 2009
Subject: svn commit: r192088 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netipsec
Message-ID: <200905140732.n4E7WXpn080800@svn.freebsd.org>

Author: vanhu
Date: Thu May 14 07:32:33 2009
New Revision: 192088
URL: http://svn.freebsd.org/changeset/base/192088

Log:
  MFC: Fixed deletion of sav entries in key_delsah()
  
  Approved by:	gnn(mentor)
  Obtained from:	NETASQ

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netipsec/key.c

Modified: stable/7/sys/netipsec/key.c
==============================================================================
--- stable/7/sys/netipsec/key.c	Thu May 14 06:50:30 2009	(r192087)
+++ stable/7/sys/netipsec/key.c	Thu May 14 07:32:33 2009	(r192088)
@@ -2654,7 +2654,12 @@ key_delsah(sah)
 			if (sav->refcnt == 0) {
 				/* sanity check */
 				KEY_CHKSASTATE(state, sav->state, __func__);
-				KEY_FREESAV(&sav);
+				/* 
+				 * do NOT call KEY_FREESAV here:
+				 * it will only delete the sav if refcnt == 1,
+				 * where we already know that refcnt == 0
+				 */
+				key_delsav(sav);
 			} else {
 				/* give up to delete this sa */
 				zombie++;
@@ -4086,6 +4091,7 @@ key_flush_sad(time_t now)
 
 		/* if LARVAL entry doesn't become MATURE, delete it. */
 		LIST_FOREACH_SAFE(sav, &sah->savtree[SADB_SASTATE_LARVAL], chain, nextsav) {
+			/* Need to also check refcnt for a larval SA ??? */
 			if (now - sav->created > key_larval_lifetime)
 				KEY_FREESAV(&sav);
 		}
From kib at FreeBSD.org  Thu May 14 11:03:07 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Thu May 14 11:03:18 2009
Subject: svn commit: r192095 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905141103.n4EB36g2089216@svn.freebsd.org>

Author: kib
Date: Thu May 14 11:03:05 2009
New Revision: 192095
URL: http://svn.freebsd.org/changeset/base/192095

Log:
  MFC r192001:
  Prevent overflow of uio_resid.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/vfs_syscalls.c

Modified: stable/7/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/7/sys/kern/vfs_syscalls.c	Thu May 14 10:54:57 2009	(r192094)
+++ stable/7/sys/kern/vfs_syscalls.c	Thu May 14 11:03:05 2009	(r192095)
@@ -2360,6 +2360,9 @@ kern_readlink(struct thread *td, char *p
 	struct nameidata nd;
 	int vfslocked;
 
+	if (count > INT_MAX)
+		return (EINVAL);
+
 	NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKSHARED | LOCKLEAF | MPSAFE |
 	    AUDITVNODE1, pathseg, path, td);
 	if ((error = namei(&nd)) != 0)
From ed at FreeBSD.org  Thu May 14 22:01:02 2009
From: ed at FreeBSD.org (Ed Schouten)
Date: Thu May 14 22:01:08 2009
Subject: svn commit: r192123 - stable/7/usr.sbin/pstat
Message-ID: <200905142201.n4EM10EM003735@svn.freebsd.org>

Author: ed
Date: Thu May 14 22:01:00 2009
New Revision: 192123
URL: http://svn.freebsd.org/changeset/base/192123

Log:
  Make the layout of pstat -t less awful.
  
  Right now we have a device named "consolectl", but pstat only reserves 7
  columns for the device name. Increase it to 10 to make it fit.
  
  This patch only applies to pre-MPSAFE TTY.

Modified:
  stable/7/usr.sbin/pstat/pstat.c

Modified: stable/7/usr.sbin/pstat/pstat.c
==============================================================================
--- stable/7/usr.sbin/pstat/pstat.c	Thu May 14 21:53:35 2009	(r192122)
+++ stable/7/usr.sbin/pstat/pstat.c	Thu May 14 22:01:00 2009	(r192123)
@@ -215,7 +215,7 @@ static const char fhdr64[] =
 /* c000000000000000 ------ RWAI 123 123 c000000000000000 1000000000000000 */
 
 static const char hdr[] =
-"  LINE RAW CAN OUT IHIWT ILOWT OHWT LWT     COL STATE  SESS      PGID DISC\n";
+"     LINE RAW CAN OUT IHIWT ILOWT OHWT LWT     COL STATE  SESS      PGID DISC\n";
 
 static void
 ttymode_kvm(void)
@@ -348,9 +348,9 @@ ttyprt(struct xtty *xt)
 		errx(1, "struct xtty size mismatch");
 	if (usenumflag || xt->xt_dev == 0 ||
 	   (name = devname(xt->xt_dev, S_IFCHR)) == NULL)
-		printf("   %2d,%-2d", major(xt->xt_dev), minor(xt->xt_dev));
+		printf("%5d,%4d ", major(xt->xt_dev), minor(xt->xt_dev));
 	else
-		(void)printf("%7s ", name);
+		(void)printf("%10s ", name);
 	(void)printf("%2ld %3ld ", xt->xt_rawcc, xt->xt_cancc);
 	(void)printf("%3ld %5d %5d %4d %3d %7d ", xt->xt_outcc,
 		xt->xt_ihiwat, xt->xt_ilowat, xt->xt_ohiwat, xt->xt_olowat,
From bms at FreeBSD.org  Fri May 15 05:31:01 2009
From: bms at FreeBSD.org (Bruce Simpson)
Date: Fri May 15 05:31:33 2009
Subject: svn commit: r192033 - stable/7/sys/dev/ata
In-Reply-To: <200905130255.n4D2tMQZ040010@svn.freebsd.org>
References: <200905130255.n4D2tMQZ040010@svn.freebsd.org>
Message-ID: <4A0CF9EA.6080403@FreeBSD.org>

Hi,

Could this commit have broken boot on my amd64 system with an ULi SATA 
controller?

I have not fully bisected (and to be honest, who really has time to do 
this for production machines, unless

The panic I get with RELENG_7 sources as of yesterday after this commit 
is 'resource list busy'. If you need any more information let me know, I 
have transcribed the backtrace and posted it to stable@.

thanks,
BMS

Alexander Motin wrote:
> Author: mav
> Date: Wed May 13 02:55:21 2009
> New Revision: 192033
> URL: http://svn.freebsd.org/changeset/base/192033
>
> Log:
>   Make vendor-specific drivers prefered over the generic AHCI one.
>   This fixes some controllers, like JMicron ones, which provide also PATA via
>   PCI function that declared as AHCI controller.
>   
>   This is not an MFC, but the same was already done in 8-CURRENT in other way.
>   
>   PR:		kern/132082
>
> ...
>   

From kib at FreeBSD.org  Fri May 15 10:45:53 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Fri May 15 10:46:13 2009
Subject: svn commit: r192140 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb fs/fdescfs
Message-ID: <200905151045.n4FAjqIw019934@svn.freebsd.org>

Author: kib
Date: Fri May 15 10:45:52 2009
New Revision: 192140
URL: http://svn.freebsd.org/changeset/base/192140

Log:
  MFC r192012:
  Return controlled EINVAL when the fdescfs lookup routine is given string
  representing too large integer, instead of overflowing and possibly
  returning a random but valid vnode.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/fs/fdescfs/fdesc_vnops.c

Modified: stable/7/sys/fs/fdescfs/fdesc_vnops.c
==============================================================================
--- stable/7/sys/fs/fdescfs/fdesc_vnops.c	Fri May 15 10:11:54 2009	(r192139)
+++ stable/7/sys/fs/fdescfs/fdesc_vnops.c	Fri May 15 10:45:52 2009	(r192140)
@@ -264,7 +264,7 @@ fdesc_lookup(ap)
 	struct thread *td = cnp->cn_thread;
 	struct file *fp;
 	int nlen = cnp->cn_namelen;
-	u_int fd;
+	u_int fd, fd1;
 	int error;
 	struct vnode *fvp;
 
@@ -296,7 +296,12 @@ fdesc_lookup(ap)
 			error = ENOENT;
 			goto bad;
 		}
-		fd = 10 * fd + *pname++ - '0';
+		fd1 = 10 * fd + *pname++ - '0';
+		if (fd1 < fd) {
+			error = ENOENT;
+			goto bad;
+		}
+		fd = fd1;
 	}
 
 	if ((error = fget(td, fd, &fp)) != 0)
From dfr at FreeBSD.org  Fri May 15 13:58:46 2009
From: dfr at FreeBSD.org (Doug Rabson)
Date: Fri May 15 13:59:04 2009
Subject: svn commit: r192142 - stable/7/sys/rpc
Message-ID: <200905151358.n4FDwjoX025344@svn.freebsd.org>

Author: dfr
Date: Fri May 15 13:58:45 2009
New Revision: 192142
URL: http://svn.freebsd.org/changeset/base/192142

Log:
  Back port a change to the locking model used to manage active transports from
  FreeBSD-current to avoid a deadlock.
  
  PR:		130628

Modified:
  stable/7/sys/rpc/svc.c
  stable/7/sys/rpc/svc.h
  stable/7/sys/rpc/svc_dg.c
  stable/7/sys/rpc/svc_vc.c

Modified: stable/7/sys/rpc/svc.c
==============================================================================
--- stable/7/sys/rpc/svc.c	Fri May 15 13:26:54 2009	(r192141)
+++ stable/7/sys/rpc/svc.c	Fri May 15 13:58:45 2009	(r192142)
@@ -178,18 +178,23 @@ xprt_active(SVCXPRT *xprt)
 }
 
 void
-xprt_inactive(SVCXPRT *xprt)
+xprt_inactive_locked(SVCXPRT *xprt)
 {
 	SVCPOOL *pool = xprt->xp_pool;
 
-	mtx_lock(&pool->sp_lock);
-
 	if (xprt->xp_active) {
 		TAILQ_REMOVE(&pool->sp_active, xprt, xp_alink);
 		xprt->xp_active = FALSE;
 	}
-	wakeup(&pool->sp_active);
+}
 
+void
+xprt_inactive(SVCXPRT *xprt)
+{
+	SVCPOOL *pool = xprt->xp_pool;
+
+	mtx_lock(&pool->sp_lock);
+	xprt_inactive_locked(xprt);
 	mtx_unlock(&pool->sp_lock);
 }
 

Modified: stable/7/sys/rpc/svc.h
==============================================================================
--- stable/7/sys/rpc/svc.h	Fri May 15 13:26:54 2009	(r192141)
+++ stable/7/sys/rpc/svc.h	Fri May 15 13:58:45 2009	(r192142)
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #endif
 
 /*
@@ -128,7 +129,7 @@ struct __rpc_svcpool;
  */
 typedef struct __rpc_svcxprt {
 #ifdef _KERNEL
-	struct mtx	xp_lock;
+	struct sx	xp_lock;
 	struct __rpc_svcpool *xp_pool;  /* owning pool (see below) */
 	TAILQ_ENTRY(__rpc_svcxprt) xp_link;
 	TAILQ_ENTRY(__rpc_svcxprt) xp_alink;
@@ -332,6 +333,7 @@ __END_DECLS
 __BEGIN_DECLS
 extern void	xprt_active(SVCXPRT *);
 extern void	xprt_inactive(SVCXPRT *);
+extern void	xprt_inactive_locked(SVCXPRT *);
 __END_DECLS
 
 #endif

Modified: stable/7/sys/rpc/svc_dg.c
==============================================================================
--- stable/7/sys/rpc/svc_dg.c	Fri May 15 13:26:54 2009	(r192141)
+++ stable/7/sys/rpc/svc_dg.c	Fri May 15 13:58:45 2009	(r192142)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -118,7 +119,7 @@ svc_dg_create(SVCPOOL *pool, struct sock
 
 	xprt = mem_alloc(sizeof (SVCXPRT));
 	memset(xprt, 0, sizeof (SVCXPRT));
-	mtx_init(&xprt->xp_lock, "xprt->xp_lock", NULL, MTX_DEF);
+	sx_init(&xprt->xp_lock, "xprt->xp_lock");
 	xprt->xp_pool = pool;
 	xprt->xp_socket = so;
 	xprt->xp_p1 = NULL;
@@ -161,6 +162,9 @@ static enum xprt_stat
 svc_dg_stat(SVCXPRT *xprt)
 {
 
+	if (soreadable(xprt->xp_socket))
+		return (XPRT_MOREREQS);
+
 	return (XPRT_IDLE);
 }
 
@@ -173,22 +177,17 @@ svc_dg_recv(SVCXPRT *xprt, struct rpc_ms
 	int error, rcvflag;
 
 	/*
+	 * Serialise access to the socket.
+	 */
+	sx_xlock(&xprt->xp_lock);
+
+	/*
 	 * The socket upcall calls xprt_active() which will eventually
 	 * cause the server to call us here. We attempt to read a
 	 * packet from the socket and process it. If the read fails,
 	 * we have drained all pending requests so we call
 	 * xprt_inactive().
-	 *
-	 * The lock protects us in the case where a new packet arrives
-	 * on the socket after our call to soreceive fails with
-	 * EWOULDBLOCK - the call to xprt_active() in the upcall will
-	 * happen only after our call to xprt_inactive() which ensures
-	 * that we will remain active. It might be possible to use
-	 * SOCKBUF_LOCK for this - its not clear to me what locks are
-	 * held during the upcall.
 	 */
-	mtx_lock(&xprt->xp_lock);
-
 	uio.uio_resid = 1000000000;
 	uio.uio_td = curthread;
 	mreq = NULL;
@@ -196,8 +195,19 @@ svc_dg_recv(SVCXPRT *xprt, struct rpc_ms
 	error = soreceive(xprt->xp_socket, &raddr, &uio, &mreq, NULL, &rcvflag);
 
 	if (error == EWOULDBLOCK) {
-		xprt_inactive(xprt);
-		mtx_unlock(&xprt->xp_lock);
+		/*
+		 * We must re-test for readability after taking the
+		 * lock to protect us in the case where a new packet
+		 * arrives on the socket after our call to soreceive
+		 * fails with EWOULDBLOCK. The pool lock protects us
+		 * from racing the upcall after our soreadable() call
+		 * returns false.
+		 */
+		mtx_lock(&xprt->xp_pool->sp_lock);
+		if (!soreadable(xprt->xp_socket))
+			xprt_inactive_locked(xprt);
+		mtx_unlock(&xprt->xp_pool->sp_lock);
+		sx_xunlock(&xprt->xp_lock);
 		return (FALSE);
 	}
 
@@ -208,11 +218,11 @@ svc_dg_recv(SVCXPRT *xprt, struct rpc_ms
 		xprt->xp_socket->so_rcv.sb_flags &= ~SB_UPCALL;
 		SOCKBUF_UNLOCK(&xprt->xp_socket->so_rcv);
 		xprt_inactive(xprt);
-		mtx_unlock(&xprt->xp_lock);
+		sx_xunlock(&xprt->xp_lock);
 		return (FALSE);
 	}
 
-	mtx_unlock(&xprt->xp_lock);
+	sx_xunlock(&xprt->xp_lock);
 
 	KASSERT(raddr->sa_len < xprt->xp_rtaddr.maxlen,
 	    ("Unexpected remote address length"));
@@ -301,7 +311,7 @@ svc_dg_destroy(SVCXPRT *xprt)
 
 	xprt_unregister(xprt);
 
-	mtx_destroy(&xprt->xp_lock);
+	sx_destroy(&xprt->xp_lock);
 	if (xprt->xp_socket)
 		(void)soclose(xprt->xp_socket);
 
@@ -328,7 +338,5 @@ svc_dg_soupcall(struct socket *so, void 
 {
 	SVCXPRT *xprt = (SVCXPRT *) arg;
 
-	mtx_lock(&xprt->xp_lock);
 	xprt_active(xprt);
-	mtx_unlock(&xprt->xp_lock);
 }

Modified: stable/7/sys/rpc/svc_vc.c
==============================================================================
--- stable/7/sys/rpc/svc_vc.c	Fri May 15 13:26:54 2009	(r192141)
+++ stable/7/sys/rpc/svc_vc.c	Fri May 15 13:58:45 2009	(r192142)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -142,7 +143,7 @@ svc_vc_create(SVCPOOL *pool, struct sock
 	}
 
 	xprt = mem_alloc(sizeof(SVCXPRT));
-	mtx_init(&xprt->xp_lock, "xprt->xp_lock", NULL, MTX_DEF);
+	sx_init(&xprt->xp_lock, "xprt->xp_lock");
 	xprt->xp_pool = pool;
 	xprt->xp_socket = so;
 	xprt->xp_p1 = NULL;
@@ -219,7 +220,7 @@ svc_vc_create_conn(SVCPOOL *pool, struct
 	cd->strm_stat = XPRT_IDLE;
 
 	xprt = mem_alloc(sizeof(SVCXPRT));
-	mtx_init(&xprt->xp_lock, "xprt->xp_lock", NULL, MTX_DEF);
+	sx_init(&xprt->xp_lock, "xprt->xp_lock");
 	xprt->xp_pool = pool;
 	xprt->xp_socket = so;
 	xprt->xp_p1 = cd;
@@ -255,9 +256,9 @@ svc_vc_create_conn(SVCPOOL *pool, struct
 	 * Throw the transport into the active list in case it already
 	 * has some data buffered.
 	 */
-	mtx_lock(&xprt->xp_lock);
+	sx_xlock(&xprt->xp_lock);
 	xprt_active(xprt);
-	mtx_unlock(&xprt->xp_lock);
+	sx_xunlock(&xprt->xp_lock);
 
 	return (xprt);
 cleanup_svc_vc_create:
@@ -347,22 +348,27 @@ svc_vc_rendezvous_recv(SVCXPRT *xprt, st
 	 * connection from the socket and turn it into a new
 	 * transport. If the accept fails, we have drained all pending
 	 * connections so we call xprt_inactive().
-	 *
-	 * The lock protects us in the case where a new connection arrives
-	 * on the socket after our call to accept fails with
-	 * EWOULDBLOCK - the call to xprt_active() in the upcall will
-	 * happen only after our call to xprt_inactive() which ensures
-	 * that we will remain active. It might be possible to use
-	 * SOCKBUF_LOCK for this - its not clear to me what locks are
-	 * held during the upcall.
 	 */
-	mtx_lock(&xprt->xp_lock);
+	sx_xlock(&xprt->xp_lock);
 
 	error = svc_vc_accept(xprt->xp_socket, &so);
 
 	if (error == EWOULDBLOCK) {
-		xprt_inactive(xprt);
-		mtx_unlock(&xprt->xp_lock);
+		/*
+		 * We must re-test for new connections after taking
+		 * the lock to protect us in the case where a new
+		 * connection arrives after our call to accept fails
+		 * with EWOULDBLOCK. The pool lock protects us from
+		 * racing the upcall after our TAILQ_EMPTY() call
+		 * returns false.
+		 */
+		ACCEPT_LOCK();
+		mtx_lock(&xprt->xp_pool->sp_lock);
+		if (TAILQ_EMPTY(&xprt->xp_socket->so_comp))
+			xprt_inactive_locked(xprt);
+		mtx_unlock(&xprt->xp_pool->sp_lock);
+		ACCEPT_UNLOCK();
+		sx_xunlock(&xprt->xp_lock);
 		return (FALSE);
 	}
 
@@ -373,11 +379,11 @@ svc_vc_rendezvous_recv(SVCXPRT *xprt, st
 		xprt->xp_socket->so_rcv.sb_flags &= ~SB_UPCALL;
 		SOCKBUF_UNLOCK(&xprt->xp_socket->so_rcv);
 		xprt_inactive(xprt);
-		mtx_unlock(&xprt->xp_lock);
+		sx_xunlock(&xprt->xp_lock);
 		return (FALSE);
 	}
 
-	mtx_unlock(&xprt->xp_lock);
+	sx_xunlock(&xprt->xp_lock);
 
 	sa = 0;
 	error = soaccept(so, &sa);
@@ -422,7 +428,7 @@ svc_vc_destroy_common(SVCXPRT *xprt)
 
 	xprt_unregister(xprt);
 
-	mtx_destroy(&xprt->xp_lock);
+	sx_destroy(&xprt->xp_lock);
 	if (xprt->xp_socket)
 		(void)soclose(xprt->xp_socket);
 
@@ -483,21 +489,29 @@ svc_vc_stat(SVCXPRT *xprt)
 
 	/*
 	 * Return XPRT_MOREREQS if we have buffered data and we are
-	 * mid-record or if we have enough data for a record marker.
+	 * mid-record or if we have enough data for a record
+	 * marker. Since this is only a hint, we read mpending and
+	 * resid outside the lock. We do need to take the lock if we
+	 * have to traverse the mbuf chain.
 	 */
 	if (cd->mpending) {
 		if (cd->resid)
 			return (XPRT_MOREREQS);
 		n = 0;
+		sx_xlock(&xprt->xp_lock);
 		m = cd->mpending;
 		while (m && n < sizeof(uint32_t)) {
 			n += m->m_len;
 			m = m->m_next;
 		}
+		sx_xunlock(&xprt->xp_lock);
 		if (n >= sizeof(uint32_t))
 			return (XPRT_MOREREQS);
 	}
 
+	if (soreadable(xprt->xp_socket))
+		return (XPRT_MOREREQS);
+
 	return (XPRT_IDLE);
 }
 
@@ -509,6 +523,12 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
 	struct mbuf *m;
 	int error, rcvflag;
 
+	/*
+	 * Serialise access to the socket and our own record parsing
+	 * state.
+	 */
+	sx_xlock(&xprt->xp_lock);
+
 	for (;;) {
 		/*
 		 * If we have an mbuf chain in cd->mpending, try to parse a
@@ -584,6 +604,7 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
 				 */
 				xdrmbuf_create(&xprt->xp_xdrreq, cd->mreq, XDR_DECODE);
 				cd->mreq = NULL;
+				sx_xunlock(&xprt->xp_lock);
 				if (! xdr_callmsg(&xprt->xp_xdrreq, msg)) {
 					XDR_DESTROY(&xprt->xp_xdrreq);
 					return (FALSE);
@@ -602,17 +623,7 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
 		 * the result in cd->mpending. If the read fails,
 		 * we have drained both cd->mpending and the socket so
 		 * we can call xprt_inactive().
-		 *
-		 * The lock protects us in the case where a new packet arrives
-		 * on the socket after our call to soreceive fails with
-		 * EWOULDBLOCK - the call to xprt_active() in the upcall will
-		 * happen only after our call to xprt_inactive() which ensures
-		 * that we will remain active. It might be possible to use
-		 * SOCKBUF_LOCK for this - its not clear to me what locks are
-		 * held during the upcall.
 		 */
-		mtx_lock(&xprt->xp_lock);
-
 		uio.uio_resid = 1000000000;
 		uio.uio_td = curthread;
 		m = NULL;
@@ -621,8 +632,20 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
 		    &rcvflag);
 
 		if (error == EWOULDBLOCK) {
-			xprt_inactive(xprt);
-			mtx_unlock(&xprt->xp_lock);
+			/*
+			 * We must re-test for readability after
+			 * taking the lock to protect us in the case
+			 * where a new packet arrives on the socket
+			 * after our call to soreceive fails with
+			 * EWOULDBLOCK. The pool lock protects us from
+			 * racing the upcall after our soreadable()
+			 * call returns false.
+			 */
+			mtx_lock(&xprt->xp_pool->sp_lock);
+			if (!soreadable(xprt->xp_socket))
+				xprt_inactive_locked(xprt);
+			mtx_unlock(&xprt->xp_pool->sp_lock);
+			sx_xunlock(&xprt->xp_lock);
 			return (FALSE);
 		}
 
@@ -634,7 +657,7 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
 			SOCKBUF_UNLOCK(&xprt->xp_socket->so_rcv);
 			xprt_inactive(xprt);
 			cd->strm_stat = XPRT_DIED;
-			mtx_unlock(&xprt->xp_lock);
+			sx_xunlock(&xprt->xp_lock);
 			return (FALSE);
 		}
 
@@ -642,8 +665,9 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
 			/*
 			 * EOF - the other end has closed the socket.
 			 */
+			xprt_inactive(xprt);
 			cd->strm_stat = XPRT_DIED;
-			mtx_unlock(&xprt->xp_lock);
+			sx_xunlock(&xprt->xp_lock);
 			return (FALSE);
 		}
 
@@ -651,8 +675,6 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_ms
 			m_last(cd->mpending)->m_next = m;
 		else
 			cd->mpending = m;
-
-		mtx_unlock(&xprt->xp_lock);
 	}
 }
 
@@ -739,9 +761,7 @@ svc_vc_soupcall(struct socket *so, void 
 {
 	SVCXPRT *xprt = (SVCXPRT *) arg;
 
-	mtx_lock(&xprt->xp_lock);
 	xprt_active(xprt);
-	mtx_unlock(&xprt->xp_lock);
 }
 
 #if 0
From mav at FreeBSD.org  Fri May 15 15:25:36 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Fri May 15 15:25:47 2009
Subject: svn commit: r192033 - stable/7/sys/dev/ata
In-Reply-To: <4A0CF9EA.6080403@FreeBSD.org>
References: <200905130255.n4D2tMQZ040010@svn.freebsd.org>
	<4A0CF9EA.6080403@FreeBSD.org>
Message-ID: <4A0D7B50.4090602@FreeBSD.org>

Bruce Simpson wrote:
> Could this commit have broken boot on my amd64 system with an ULi SATA 
> controller?

This commit could change driver used for controller and so expose some 
other bug in ALI driver. As I can see, there is present vendor-specific 
driver for this chip, but without pciconf output I can't say if AHCI 
driver is also able to attach it.

> I have not fully bisected (and to be honest, who really has time to do 
> this for production machines, unless
> 
> The panic I get with RELENG_7 sources as of yesterday after this commit 
> is 'resource list busy'. If you need any more information let me know, I 
> have transcribed the backtrace and posted it to stable@.

Which revision was working for you before this? If, as you have said, 
reverting rev 192033 does not helped, then there should be something 
different. May be not in ATA, as there was very few merges into 7-STABLE 
ATA last months.

-- 
Alexander Motin
From jhb at FreeBSD.org  Fri May 15 18:50:31 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Fri May 15 18:50:43 2009
Subject: svn commit: r192149 - in stable/7: share/man/man4 sys
	sys/contrib/pf sys/dev/ath/ath_hal sys/dev/cxgb
	sys/dev/ichsmb sys/dev/ipmi sys/dev/smbus sys/sys
Message-ID: <200905151850.n4FIoULn031343@svn.freebsd.org>

Author: jhb
Date: Fri May 15 18:50:30 2009
New Revision: 192149
URL: http://svn.freebsd.org/changeset/base/192149

Log:
  MFC: Change ichsmb(4) to follow the format of all the other smbus
  controllers for slave addressing by using left-adjusted slave addresses
  (i.e. xxxxxxx0b).

Modified:
  stable/7/share/man/man4/   (props changed)
  stable/7/share/man/man4/igb.4   (props changed)
  stable/7/share/man/man4/smb.4
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/ichsmb/ichsmb.c
  stable/7/sys/dev/ipmi/ipmi_acpi.c
  stable/7/sys/dev/ipmi/ipmi_smbios.c
  stable/7/sys/dev/smbus/smb.c
  stable/7/sys/sys/param.h

Modified: stable/7/share/man/man4/smb.4
==============================================================================
--- stable/7/share/man/man4/smb.4	Fri May 15 18:25:44 2009	(r192148)
+++ stable/7/share/man/man4/smb.4	Fri May 15 18:50:30 2009	(r192149)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 25, 1998
+.Dd February 6, 2009
 .Dt SMB 4
 .Os
 .Sh NAME
@@ -72,6 +72,9 @@ The
 .Fa slave
 field is always used, and provides the address of the
 SMBus slave device to talk to.
+The slave address is specified in the seven most significant bits
+.Pq i.e. Dq "left-justified" .
+The least significant bit of the slave address must be zero.
 .Pp
 .Bl -column ".Dv SMB_QUICK_WRITE" -compact
 .It Em Ioctl Ta Em Description

Modified: stable/7/sys/dev/ichsmb/ichsmb.c
==============================================================================
--- stable/7/sys/dev/ichsmb/ichsmb.c	Fri May 15 18:25:44 2009	(r192148)
+++ stable/7/sys/dev/ichsmb/ichsmb.c	Fri May 15 18:50:30 2009	(r192149)
@@ -182,7 +182,7 @@ ichsmb_quick(device_t dev, u_char slave,
 		mtx_lock(&sc->mutex);
 		sc->ich_cmd = ICH_HST_CNT_SMB_CMD_QUICK;
 		bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-		    (slave << 1) | (how == SMB_QREAD ?
+		    slave | (how == SMB_QREAD ?
 	    		ICH_XMIT_SLVA_READ : ICH_XMIT_SLVA_WRITE));
 		bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT,
 		    ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd);
@@ -208,7 +208,7 @@ ichsmb_sendb(device_t dev, u_char slave,
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_WRITE);
+	    slave | ICH_XMIT_SLVA_WRITE);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, byte);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT,
 	    ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd);
@@ -230,7 +230,7 @@ ichsmb_recvb(device_t dev, u_char slave,
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_READ);
+	    slave | ICH_XMIT_SLVA_READ);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT,
 	    ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd);
 	if ((smb_error = ichsmb_wait(sc)) == SMB_ENOERR)
@@ -253,7 +253,7 @@ ichsmb_writeb(device_t dev, u_char slave
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_WRITE);
+	    slave | ICH_XMIT_SLVA_WRITE);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D0, byte);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT,
@@ -277,7 +277,7 @@ ichsmb_writew(device_t dev, u_char slave
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_WORD_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_WRITE);
+	    slave | ICH_XMIT_SLVA_WRITE);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D0, word & 0xff);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D1, word >> 8);
@@ -301,7 +301,7 @@ ichsmb_readb(device_t dev, u_char slave,
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BYTE_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_READ);
+	    slave | ICH_XMIT_SLVA_READ);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT,
 	    ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd);
@@ -324,7 +324,7 @@ ichsmb_readw(device_t dev, u_char slave,
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_WORD_DATA;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_READ);
+	    slave | ICH_XMIT_SLVA_READ);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT,
 	    ICH_HST_CNT_START | ICH_HST_CNT_INTREN | sc->ich_cmd);
@@ -352,7 +352,7 @@ ichsmb_pcall(device_t dev, u_char slave,
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_PROC_CALL;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_WRITE);
+	    slave | ICH_XMIT_SLVA_WRITE);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D0, sdata & 0xff);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D1, sdata >> 8);
@@ -403,7 +403,7 @@ ichsmb_bwrite(device_t dev, u_char slave
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_WRITE);
+	    slave | ICH_XMIT_SLVA_WRITE);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D0, count);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_BLOCK_DB, buf[0]);
@@ -434,7 +434,7 @@ ichsmb_bread(device_t dev, u_char slave,
 	mtx_lock(&sc->mutex);
 	sc->ich_cmd = ICH_HST_CNT_SMB_CMD_BLOCK;
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_XMIT_SLVA,
-	    (slave << 1) | ICH_XMIT_SLVA_READ);
+	    slave | ICH_XMIT_SLVA_READ);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CMD, cmd);
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_D0, *count); /* XXX? */
 	bus_space_write_1(sc->io_bst, sc->io_bsh, ICH_HST_CNT,

Modified: stable/7/sys/dev/ipmi/ipmi_acpi.c
==============================================================================
--- stable/7/sys/dev/ipmi/ipmi_acpi.c	Fri May 15 18:25:44 2009	(r192148)
+++ stable/7/sys/dev/ipmi/ipmi_acpi.c	Fri May 15 18:50:30 2009	(r192149)
@@ -104,7 +104,7 @@ ipmi_acpi_attach(device_t dev)
 	case SSIF_MODE:
 		if (ACPI_FAILURE(acpi_GetInteger(devh, "_ADR", &flags)))
 			return (ENXIO);
-		info.address = flags >> 1;
+		info.address = flags;
 		device_printf(dev, "SSIF interface not supported on ACPI\n");
 		return (0);
 	default:

Modified: stable/7/sys/dev/ipmi/ipmi_smbios.c
==============================================================================
--- stable/7/sys/dev/ipmi/ipmi_smbios.c	Fri May 15 18:25:44 2009	(r192148)
+++ stable/7/sys/dev/ipmi/ipmi_smbios.c	Fri May 15 18:50:30 2009	(r192149)
@@ -154,10 +154,10 @@ smbios_t38_proc_info(uint8_t *p, char **
 	case SSIF_MODE:
 		if ((s->base_address & 0xffffffffffffff00) != 0) {
 			printf("SMBIOS: Invalid SSIF SMBus address, using BMC I2C slave address instead\n");
-			info->address = s->i2c_slave_address >> 1;
+			info->address = s->i2c_slave_address;
 			break;
 		}
-		info->address = IPMI_BAR_ADDR(s->base_address) >> 1;
+		info->address = IPMI_BAR_ADDR(s->base_address);
 		break;
 	default:
 		return;

Modified: stable/7/sys/dev/smbus/smb.c
==============================================================================
--- stable/7/sys/dev/smbus/smb.c	Fri May 15 18:25:44 2009	(r192148)
+++ stable/7/sys/dev/smbus/smb.c	Fri May 15 18:50:30 2009	(r192149)
@@ -195,6 +195,10 @@ smbioctl(struct cdev *dev, u_long cmd, c
 
 	parent = device_get_parent(smbdev);
 
+	/* Make sure that LSB bit is cleared. */
+	if (s->slave & 0x1)
+		return (EINVAL);
+
 	/* Allocate the bus. */
 	if ((error = smbus_request_bus(parent, smbdev,
 			(flags & O_NONBLOCK) ? SMB_DONTWAIT : (SMB_WAIT | SMB_INTR))))

Modified: stable/7/sys/sys/param.h
==============================================================================
--- stable/7/sys/sys/param.h	Fri May 15 18:25:44 2009	(r192148)
+++ stable/7/sys/sys/param.h	Fri May 15 18:50:30 2009	(r192149)
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 702100	/* Master, propagated to newvers */
+#define __FreeBSD_version 702101	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include 
From jhb at FreeBSD.org  Fri May 15 19:19:28 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Fri May 15 19:19:37 2009
Subject: svn commit: r192150 - stable/7/usr.bin/top
Message-ID: <200905151919.n4FJJRgn032065@svn.freebsd.org>

Author: jhb
Date: Fri May 15 19:19:27 2009
New Revision: 192150
URL: http://svn.freebsd.org/changeset/base/192150

Log:
  MFC: Expand the CPU column to two chars and print in decimal rather than
  hex.

Modified:
  stable/7/usr.bin/top/   (props changed)
  stable/7/usr.bin/top/machine.c

Modified: stable/7/usr.bin/top/machine.c
==============================================================================
--- stable/7/usr.bin/top/machine.c	Fri May 15 18:50:30 2009	(r192149)
+++ stable/7/usr.bin/top/machine.c	Fri May 15 19:19:27 2009	(r192150)
@@ -106,12 +106,12 @@ static char io_header[] =
     "%5d%s %-*.*s %6ld %6ld %6ld %6ld %6ld %6ld %6.2f%% %.*s"
 
 static char smp_header_thr[] =
-    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE  C   TIME %6s COMMAND";
+    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
 static char smp_header[] =
-    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE  C   TIME %6s COMMAND";
+    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
 
 #define smp_Proc_format \
-    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %1x%7s %5.2f%% %.*s"
+    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %2d%7s %5.2f%% %.*s"
 
 static char up_header_thr[] =
     "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE    TIME %6s COMMAND";
From jhb at FreeBSD.org  Fri May 15 19:54:21 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Fri May 15 19:54:28 2009
Subject: svn commit: r192154 - in stable/7: sys sys/contrib/pf
	sys/dev/ath/ath_hal sys/dev/cxgb sys/kern sys/sys sys/ufs/ffs
	sys/vm usr.bin/systat usr.bin/top
Message-ID: <200905151954.n4FJsJE1032919@svn.freebsd.org>

Author: jhb
Date: Fri May 15 19:54:19 2009
New Revision: 192154
URL: http://svn.freebsd.org/changeset/base/192154

Log:
  MFC: Adjust some variables (mostly related to the buffer cache) that hold
  address space sizes to be longs instead of ints.  This includes an ABI
  compat shim for the kern.bufspace sysctl for old binaries.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/subr_param.c
  stable/7/sys/kern/sys_pipe.c
  stable/7/sys/kern/vfs_bio.c
  stable/7/sys/sys/buf.h
  stable/7/sys/sys/pipe.h
  stable/7/sys/ufs/ffs/ffs_snapshot.c
  stable/7/sys/ufs/ffs/ffs_vfsops.c
  stable/7/sys/vm/vm_init.c
  stable/7/sys/vm/vnode_pager.c
  stable/7/usr.bin/systat/   (props changed)
  stable/7/usr.bin/systat/vmstat.c
  stable/7/usr.bin/top/   (props changed)
  stable/7/usr.bin/top/machine.c

Modified: stable/7/sys/kern/subr_param.c
==============================================================================
--- stable/7/sys/kern/subr_param.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/kern/subr_param.c	Fri May 15 19:54:19 2009	(r192154)
@@ -76,9 +76,9 @@ int	maxfilesperproc;		/* per-proc open f
 int	ncallout;			/* maximum # of timer events */
 int	nbuf;
 int	nswbuf;
-int	maxswzone;			/* max swmeta KVA storage */
-int	maxbcache;			/* max buffer cache KVA storage */
-int	maxpipekva;			/* Limit on pipe KVA */
+long	maxswzone;			/* max swmeta KVA storage */
+long	maxbcache;			/* max buffer cache KVA storage */
+long	maxpipekva;			/* Limit on pipe KVA */
 u_long	maxtsiz;			/* max text size */
 u_long	dfldsiz;			/* initial data size limit */
 u_long	maxdsiz;			/* max data size */
@@ -94,9 +94,9 @@ SYSCTL_INT(_kern, OID_AUTO, nbuf, CTLFLA
     "Number of buffers in the buffer cache");
 SYSCTL_INT(_kern, OID_AUTO, nswbuf, CTLFLAG_RDTUN, &nswbuf, 0,
     "Number of swap buffers");
-SYSCTL_INT(_kern, OID_AUTO, maxswzone, CTLFLAG_RDTUN, &maxswzone, 0,
+SYSCTL_LONG(_kern, OID_AUTO, maxswzone, CTLFLAG_RDTUN, &maxswzone, 0,
     "Maximum memory for swap metadata");
-SYSCTL_INT(_kern, OID_AUTO, maxbcache, CTLFLAG_RDTUN, &maxbcache, 0,
+SYSCTL_LONG(_kern, OID_AUTO, maxbcache, CTLFLAG_RDTUN, &maxbcache, 0,
     "Maximum value of vfs.maxbufspace");
 SYSCTL_ULONG(_kern, OID_AUTO, maxtsiz, CTLFLAG_RDTUN, &maxtsiz, 0,
     "Maximum text size");
@@ -132,11 +132,11 @@ init_param1(void)
 #ifdef VM_SWZONE_SIZE_MAX
 	maxswzone = VM_SWZONE_SIZE_MAX;
 #endif
-	TUNABLE_INT_FETCH("kern.maxswzone", &maxswzone);
+	TUNABLE_LONG_FETCH("kern.maxswzone", &maxswzone);
 #ifdef VM_BCACHE_SIZE_MAX
 	maxbcache = VM_BCACHE_SIZE_MAX;
 #endif
-	TUNABLE_INT_FETCH("kern.maxbcache", &maxbcache);
+	TUNABLE_LONG_FETCH("kern.maxbcache", &maxbcache);
 
 	maxtsiz = MAXTSIZ;
 	TUNABLE_ULONG_FETCH("kern.maxtsiz", &maxtsiz);
@@ -211,5 +211,5 @@ init_param3(long kmempages)
 	maxpipekva = (kmempages / 20) * PAGE_SIZE;
 	if (maxpipekva < 512 * 1024)
 		maxpipekva = 512 * 1024;
-	TUNABLE_INT_FETCH("kern.ipc.maxpipekva", &maxpipekva);
+	TUNABLE_LONG_FETCH("kern.ipc.maxpipekva", &maxpipekva);
 }

Modified: stable/7/sys/kern/sys_pipe.c
==============================================================================
--- stable/7/sys/kern/sys_pipe.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/kern/sys_pipe.c	Fri May 15 19:54:19 2009	(r192154)
@@ -175,15 +175,15 @@ static struct filterops pipe_wfiltops =
 #define MINPIPESIZE (PIPE_SIZE/3)
 #define MAXPIPESIZE (2*PIPE_SIZE/3)
 
-static int amountpipekva;
+static long amountpipekva;
 static int pipefragretry;
 static int pipeallocfail;
 static int piperesizefail;
 static int piperesizeallowed = 1;
 
-SYSCTL_INT(_kern_ipc, OID_AUTO, maxpipekva, CTLFLAG_RDTUN,
+SYSCTL_LONG(_kern_ipc, OID_AUTO, maxpipekva, CTLFLAG_RDTUN,
 	   &maxpipekva, 0, "Pipe KVA limit");
-SYSCTL_INT(_kern_ipc, OID_AUTO, pipekva, CTLFLAG_RD,
+SYSCTL_LONG(_kern_ipc, OID_AUTO, pipekva, CTLFLAG_RD,
 	   &amountpipekva, 0, "Pipe KVA usage");
 SYSCTL_INT(_kern_ipc, OID_AUTO, pipefragretry, CTLFLAG_RD,
 	  &pipefragretry, 0, "Pipe allocation retries due to fragmentation");
@@ -458,7 +458,7 @@ retry:
 	cpipe->pipe_buffer.in = cnt;
 	cpipe->pipe_buffer.out = 0;
 	cpipe->pipe_buffer.cnt = cnt;
-	atomic_add_int(&amountpipekva, cpipe->pipe_buffer.size);
+	atomic_add_long(&amountpipekva, cpipe->pipe_buffer.size);
 	return (0);
 }
 
@@ -1437,7 +1437,7 @@ pipe_free_kmem(cpipe)
 	    ("pipe_free_kmem: pipe mutex locked"));
 
 	if (cpipe->pipe_buffer.buffer != NULL) {
-		atomic_subtract_int(&amountpipekva, cpipe->pipe_buffer.size);
+		atomic_subtract_long(&amountpipekva, cpipe->pipe_buffer.size);
 		vm_map_remove(pipe_map,
 		    (vm_offset_t)cpipe->pipe_buffer.buffer,
 		    (vm_offset_t)cpipe->pipe_buffer.buffer + cpipe->pipe_buffer.size);

Modified: stable/7/sys/kern/vfs_bio.c
==============================================================================
--- stable/7/sys/kern/vfs_bio.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/kern/vfs_bio.c	Fri May 15 19:54:19 2009	(r192154)
@@ -109,30 +109,31 @@ static int buf_do_flush(struct vnode *vp
 static int flushbufqueues(struct vnode *, int, int);
 static void buf_daemon(void);
 static void bremfreel(struct buf *bp);
+static int sysctl_bufspace(SYSCTL_HANDLER_ARGS);
 
 int vmiodirenable = TRUE;
 SYSCTL_INT(_vfs, OID_AUTO, vmiodirenable, CTLFLAG_RW, &vmiodirenable, 0,
     "Use the VM system for directory writes");
-int runningbufspace;
-SYSCTL_INT(_vfs, OID_AUTO, runningbufspace, CTLFLAG_RD, &runningbufspace, 0,
+long runningbufspace;
+SYSCTL_LONG(_vfs, OID_AUTO, runningbufspace, CTLFLAG_RD, &runningbufspace, 0,
     "Amount of presently outstanding async buffer io");
-static int bufspace;
-SYSCTL_INT(_vfs, OID_AUTO, bufspace, CTLFLAG_RD, &bufspace, 0,
-    "Virtual memory used for buffers");
-static int maxbufspace;
-SYSCTL_INT(_vfs, OID_AUTO, maxbufspace, CTLFLAG_RD, &maxbufspace, 0,
+static long bufspace;
+SYSCTL_PROC(_vfs, OID_AUTO, bufspace, CTLTYPE_LONG|CTLFLAG_MPSAFE|CTLFLAG_RD,
+    &bufspace, 0, sysctl_bufspace, "L", "Virtual memory used for buffers");
+static long maxbufspace;
+SYSCTL_LONG(_vfs, OID_AUTO, maxbufspace, CTLFLAG_RD, &maxbufspace, 0,
     "Maximum allowed value of bufspace (including buf_daemon)");
-static int bufmallocspace;
-SYSCTL_INT(_vfs, OID_AUTO, bufmallocspace, CTLFLAG_RD, &bufmallocspace, 0,
+static long bufmallocspace;
+SYSCTL_LONG(_vfs, OID_AUTO, bufmallocspace, CTLFLAG_RD, &bufmallocspace, 0,
     "Amount of malloced memory for buffers");
-static int maxbufmallocspace;
-SYSCTL_INT(_vfs, OID_AUTO, maxmallocbufspace, CTLFLAG_RW, &maxbufmallocspace, 0,
+static long maxbufmallocspace;
+SYSCTL_LONG(_vfs, OID_AUTO, maxmallocbufspace, CTLFLAG_RW, &maxbufmallocspace, 0,
     "Maximum amount of malloced memory for buffers");
-static int lobufspace;
-SYSCTL_INT(_vfs, OID_AUTO, lobufspace, CTLFLAG_RD, &lobufspace, 0,
+static long lobufspace;
+SYSCTL_LONG(_vfs, OID_AUTO, lobufspace, CTLFLAG_RD, &lobufspace, 0,
     "Minimum amount of buffers we want to have");
-int hibufspace;
-SYSCTL_INT(_vfs, OID_AUTO, hibufspace, CTLFLAG_RD, &hibufspace, 0,
+long hibufspace;
+SYSCTL_LONG(_vfs, OID_AUTO, hibufspace, CTLFLAG_RD, &hibufspace, 0,
     "Maximum allowed value of bufspace (excluding buf_daemon)");
 static int bufreusecnt;
 SYSCTL_INT(_vfs, OID_AUTO, bufreusecnt, CTLFLAG_RW, &bufreusecnt, 0,
@@ -143,11 +144,11 @@ SYSCTL_INT(_vfs, OID_AUTO, buffreekvacnt
 static int bufdefragcnt;
 SYSCTL_INT(_vfs, OID_AUTO, bufdefragcnt, CTLFLAG_RW, &bufdefragcnt, 0,
     "Number of times we have had to repeat buffer allocation to defragment");
-static int lorunningspace;
-SYSCTL_INT(_vfs, OID_AUTO, lorunningspace, CTLFLAG_RW, &lorunningspace, 0,
+static long lorunningspace;
+SYSCTL_LONG(_vfs, OID_AUTO, lorunningspace, CTLFLAG_RW, &lorunningspace, 0,
     "Minimum preferred space used for in-progress I/O");
-static int hirunningspace;
-SYSCTL_INT(_vfs, OID_AUTO, hirunningspace, CTLFLAG_RW, &hirunningspace, 0,
+static long hirunningspace;
+SYSCTL_LONG(_vfs, OID_AUTO, hirunningspace, CTLFLAG_RW, &hirunningspace, 0,
     "Maximum amount of space to use for in-progress I/O");
 int dirtybufferflushes;
 SYSCTL_INT(_vfs, OID_AUTO, dirtybufferflushes, CTLFLAG_RW, &dirtybufferflushes,
@@ -284,6 +285,22 @@ const char *buf_wmesg = BUF_WMESG;
 #define VFS_BIO_NEED_FREE	0x04	/* wait for free bufs, hi hysteresis */
 #define VFS_BIO_NEED_BUFSPACE	0x08	/* wait for buf space, lo hysteresis */
 
+static int
+sysctl_bufspace(SYSCTL_HANDLER_ARGS)
+{
+	long lvalue;
+	int ivalue;
+
+	if (sizeof(int) == sizeof(long) || req->oldlen == sizeof(long))
+		return (sysctl_handle_long(oidp, arg1, arg2, req));
+	lvalue = *(long *)arg1;
+	if (lvalue > INT_MAX)
+		/* On overflow, still write out a long to trigger ENOMEM. */
+		return (sysctl_handle_long(oidp, &lvalue, 0, req));
+	ivalue = lvalue;
+	return (sysctl_handle_int(oidp, &ivalue, 0, req));
+}
+
 #ifdef DIRECTIO
 extern void ffs_rawread_setup(void);
 #endif /* DIRECTIO */
@@ -343,7 +360,7 @@ runningbufwakeup(struct buf *bp)
 {
 
 	if (bp->b_runningbufspace) {
-		atomic_subtract_int(&runningbufspace, bp->b_runningbufspace);
+		atomic_subtract_long(&runningbufspace, bp->b_runningbufspace);
 		bp->b_runningbufspace = 0;
 		mtx_lock(&rbreqlock);
 		if (runningbufreq && runningbufspace <= lorunningspace) {
@@ -463,7 +480,8 @@ bd_speedup(void)
 caddr_t
 kern_vfs_bio_buffer_alloc(caddr_t v, long physmem_est)
 {
-	int maxbuf;
+	int tuned_nbuf;
+	long maxbuf;
 
 	/*
 	 * physmem_est is in pages.  Convert it to kilobytes (assumes
@@ -493,11 +511,17 @@ kern_vfs_bio_buffer_alloc(caddr_t v, lon
 
 		if (maxbcache && nbuf > maxbcache / BKVASIZE)
 			nbuf = maxbcache / BKVASIZE;
+		tuned_nbuf = 1;
+	} else
+		tuned_nbuf = 0;
 
-		/* XXX Avoid integer overflows later on with maxbufspace. */
-		maxbuf = (INT_MAX / 3) / BKVASIZE;
-		if (nbuf > maxbuf)
-			nbuf = maxbuf;
+	/* XXX Avoid unsigned long overflows later on with maxbufspace. */
+	maxbuf = (LONG_MAX / 3) / BKVASIZE;
+	if (nbuf > maxbuf) {
+		if (!tuned_nbuf)
+			printf("Warning: nbufs lowered from %d to %ld\n", nbuf,
+			    maxbuf);
+		nbuf = maxbuf;
 	}
 
 #if 0
@@ -582,8 +606,8 @@ bufinit(void)
 	 * this may result in KVM fragmentation which is not handled optimally
 	 * by the system.
 	 */
-	maxbufspace = nbuf * BKVASIZE;
-	hibufspace = imax(3 * maxbufspace / 4, maxbufspace - MAXBSIZE * 10);
+	maxbufspace = (long)nbuf * BKVASIZE;
+	hibufspace = lmax(3 * maxbufspace / 4, maxbufspace - MAXBSIZE * 10);
 	lobufspace = hibufspace - MAXBSIZE;
 
 	lorunningspace = 512 * 1024;
@@ -611,7 +635,7 @@ bufinit(void)
  * be met.  We try to size hidirtybuffers to 3/4 our buffer space assuming
  * BKVASIZE'd (8K) buffers.
  */
-	while (hidirtybuffers * BKVASIZE > 3 * hibufspace / 4) {
+	while ((long)hidirtybuffers * BKVASIZE > 3 * hibufspace / 4) {
 		hidirtybuffers >>= 1;
 	}
 	lodirtybuffers = hidirtybuffers / 2;
@@ -647,7 +671,7 @@ bfreekva(struct buf *bp)
 
 	if (bp->b_kvasize) {
 		atomic_add_int(&buffreekvacnt, 1);
-		atomic_subtract_int(&bufspace, bp->b_kvasize);
+		atomic_subtract_long(&bufspace, bp->b_kvasize);
 		vm_map_remove(buffer_map, (vm_offset_t) bp->b_kvabase,
 		    (vm_offset_t) bp->b_kvabase + bp->b_kvasize);
 		bp->b_kvasize = 0;
@@ -872,7 +896,7 @@ bufwrite(struct buf *bp)
 	 * Normal bwrites pipeline writes
 	 */
 	bp->b_runningbufspace = bp->b_bufsize;
-	atomic_add_int(&runningbufspace, bp->b_runningbufspace);
+	atomic_add_long(&runningbufspace, bp->b_runningbufspace);
 
 	if (!TD_IS_IDLETHREAD(curthread))
 		curthread->td_ru.ru_oublock++;
@@ -2054,7 +2078,7 @@ restart:
 
 				bp->b_kvabase = (caddr_t) addr;
 				bp->b_kvasize = maxsize;
-				atomic_add_int(&bufspace, bp->b_kvasize);
+				atomic_add_long(&bufspace, bp->b_kvasize);
 				atomic_add_int(&bufreusecnt, 1);
 			}
 			vm_map_unlock(buffer_map);
@@ -2822,7 +2846,7 @@ allocbuf(struct buf *bp, int size)
 				} else {
 					free(bp->b_data, M_BIOBUF);
 					if (bp->b_bufsize) {
-						atomic_subtract_int(
+						atomic_subtract_long(
 						    &bufmallocspace,
 						    bp->b_bufsize);
 						bufspacewakeup();
@@ -2859,7 +2883,7 @@ allocbuf(struct buf *bp, int size)
 				bp->b_bufsize = mbsize;
 				bp->b_bcount = size;
 				bp->b_flags |= B_MALLOC;
-				atomic_add_int(&bufmallocspace, mbsize);
+				atomic_add_long(&bufmallocspace, mbsize);
 				return 1;
 			}
 			origbuf = NULL;
@@ -2873,7 +2897,7 @@ allocbuf(struct buf *bp, int size)
 				origbufsize = bp->b_bufsize;
 				bp->b_data = bp->b_kvabase;
 				if (bp->b_bufsize) {
-					atomic_subtract_int(&bufmallocspace,
+					atomic_subtract_long(&bufmallocspace,
 					    bp->b_bufsize);
 					bufspacewakeup();
 					bp->b_bufsize = 0;

Modified: stable/7/sys/sys/buf.h
==============================================================================
--- stable/7/sys/sys/buf.h	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/sys/buf.h	Fri May 15 19:54:19 2009	(r192154)
@@ -479,10 +479,10 @@ buf_countdeps(struct buf *bp, int i)
 
 #ifdef _KERNEL
 extern int	nbuf;			/* The number of buffer headers */
-extern int	maxswzone;		/* Max KVA for swap structures */
-extern int	maxbcache;		/* Max KVA for buffer cache */
-extern int	runningbufspace;
-extern int	hibufspace;
+extern long	maxswzone;		/* Max KVA for swap structures */
+extern long	maxbcache;		/* Max KVA for buffer cache */
+extern long	runningbufspace;
+extern long	hibufspace;
 extern int	dirtybufthresh;
 extern int	bdwriteskip;
 extern int	dirtybufferflushes;

Modified: stable/7/sys/sys/pipe.h
==============================================================================
--- stable/7/sys/sys/pipe.h	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/sys/pipe.h	Fri May 15 19:54:19 2009	(r192154)
@@ -56,7 +56,7 @@
 /*
  * See sys_pipe.c for info on what these limits mean. 
  */
-extern int	maxpipekva;
+extern long	maxpipekva;
 
 /*
  * Pipe buffer information.

Modified: stable/7/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- stable/7/sys/ufs/ffs/ffs_snapshot.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/ufs/ffs/ffs_snapshot.c	Fri May 15 19:54:19 2009	(r192154)
@@ -2272,7 +2272,7 @@ ffs_copyonwrite(devvp, bp)
 			VI_UNLOCK(devvp);
 			if (saved_runningbufspace != 0) {
 				bp->b_runningbufspace = saved_runningbufspace;
-				atomic_add_int(&runningbufspace,
+				atomic_add_long(&runningbufspace,
 					       bp->b_runningbufspace);
 			}
 			return (0);		/* Snapshot gone */
@@ -2397,7 +2397,7 @@ ffs_copyonwrite(devvp, bp)
 	 */
 	if (saved_runningbufspace != 0) {
 		bp->b_runningbufspace = saved_runningbufspace;
-		atomic_add_int(&runningbufspace, bp->b_runningbufspace);
+		atomic_add_long(&runningbufspace, bp->b_runningbufspace);
 	}
 	return (error);
 }

Modified: stable/7/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/7/sys/ufs/ffs/ffs_vfsops.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/ufs/ffs/ffs_vfsops.c	Fri May 15 19:54:19 2009	(r192154)
@@ -1919,7 +1919,7 @@ ffs_geom_strategy(struct bufobj *bo, str
 					}
 				}
 				bp->b_runningbufspace = bp->b_bufsize;
-				atomic_add_int(&runningbufspace,
+				atomic_add_long(&runningbufspace,
 					       bp->b_runningbufspace);
 			} else {
 				error = ffs_copyonwrite(vp, bp);

Modified: stable/7/sys/vm/vm_init.c
==============================================================================
--- stable/7/sys/vm/vm_init.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/vm/vm_init.c	Fri May 15 19:54:19 2009	(r192154)
@@ -186,12 +186,12 @@ again:
 		panic("startup: table size inconsistency");
 
 	clean_map = kmem_suballoc(kernel_map, &kmi->clean_sva, &kmi->clean_eva,
-	    nbuf * BKVASIZE + nswbuf * MAXPHYS, FALSE);
+	    (long)nbuf * BKVASIZE + (long)nswbuf * MAXPHYS, FALSE);
 	buffer_map = kmem_suballoc(clean_map, &kmi->buffer_sva,
-	    &kmi->buffer_eva, nbuf * BKVASIZE, FALSE);
+	    &kmi->buffer_eva, (long)nbuf * BKVASIZE, FALSE);
 	buffer_map->system_map = 1;
 	pager_map = kmem_suballoc(clean_map, &kmi->pager_sva, &kmi->pager_eva,
-	    nswbuf * MAXPHYS, FALSE);
+	    (long)nswbuf * MAXPHYS, FALSE);
 	pager_map->system_map = 1;
 	exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr,
 	    exec_map_entries * (ARG_MAX + (PAGE_SIZE * 3)), FALSE);

Modified: stable/7/sys/vm/vnode_pager.c
==============================================================================
--- stable/7/sys/vm/vnode_pager.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/sys/vm/vnode_pager.c	Fri May 15 19:54:19 2009	(r192154)
@@ -526,7 +526,7 @@ vnode_pager_input_smlfs(object, m)
 			bp->b_bcount = bsize;
 			bp->b_bufsize = bsize;
 			bp->b_runningbufspace = bp->b_bufsize;
-			atomic_add_int(&runningbufspace, bp->b_runningbufspace);
+			atomic_add_long(&runningbufspace, bp->b_runningbufspace);
 
 			/* do the input */
 			bp->b_iooffset = dbtob(bp->b_blkno);
@@ -906,7 +906,7 @@ vnode_pager_generic_getpages(vp, m, byte
 	bp->b_bcount = size;
 	bp->b_bufsize = size;
 	bp->b_runningbufspace = bp->b_bufsize;
-	atomic_add_int(&runningbufspace, bp->b_runningbufspace);
+	atomic_add_long(&runningbufspace, bp->b_runningbufspace);
 
 	PCPU_INC(cnt.v_vnodein);
 	PCPU_ADD(cnt.v_vnodepgsin, count);

Modified: stable/7/usr.bin/systat/vmstat.c
==============================================================================
--- stable/7/usr.bin/systat/vmstat.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/usr.bin/systat/vmstat.c	Fri May 15 19:54:19 2009	(r192154)
@@ -115,7 +115,7 @@ static struct Info {
 	struct	nchstats nchstats;
 	long	nchcount;
 	long	*intrcnt;
-	int	bufspace;
+	long	bufspace;
 	int	desiredvnodes;
 	long	numvnodes;
 	long	freevnodes;

Modified: stable/7/usr.bin/top/machine.c
==============================================================================
--- stable/7/usr.bin/top/machine.c	Fri May 15 19:41:10 2009	(r192153)
+++ stable/7/usr.bin/top/machine.c	Fri May 15 19:54:19 2009	(r192154)
@@ -433,7 +433,7 @@ get_system_info(struct system_info *si)
 		static unsigned int swap_delay = 0;
 		static int swapavail = 0;
 		static int swapfree = 0;
-		static int bufspace = 0;
+		static long bufspace = 0;
 		static int nspgsin, nspgsout;
 
 		GETSYSCTL("vfs.bufspace", bufspace);
From jhb at FreeBSD.org  Fri May 15 20:13:16 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Fri May 15 20:13:32 2009
Subject: svn commit: r192155 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905152013.n4FKDFwh033347@svn.freebsd.org>

Author: jhb
Date: Fri May 15 20:13:15 2009
New Revision: 192155
URL: http://svn.freebsd.org/changeset/base/192155

Log:
  MFC: Update comment above _fget() now that FWRITE failures return EBADF.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_descrip.c

Modified: stable/7/sys/kern/kern_descrip.c
==============================================================================
--- stable/7/sys/kern/kern_descrip.c	Fri May 15 19:54:19 2009	(r192154)
+++ stable/7/sys/kern/kern_descrip.c	Fri May 15 20:13:15 2009	(r192155)
@@ -2040,10 +2040,8 @@ closef(struct file *fp, struct thread *t
  * Extract the file pointer associated with the specified descriptor for the
  * current user process.
  *
- * If the descriptor doesn't exist, EBADF is returned.
- *
- * If the descriptor exists but doesn't match 'flags' then return EBADF for
- * read attempts and EINVAL for write attempts.
+ * If the descriptor doesn't exist or doesn't match 'flags', EBADF is
+ * returned.
  *
  * If 'hold' is set (non-zero) the file's refcount will be bumped on return.
  * It should be dropped with fdrop().  If it is not set, then the refcount
From jhb at FreeBSD.org  Fri May 15 20:36:55 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Fri May 15 20:37:02 2009
Subject: svn commit: r192156 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern nfsclient sys
Message-ID: <200905152036.n4FKashg033833@svn.freebsd.org>

Author: jhb
Date: Fri May 15 20:36:54 2009
New Revision: 192156
URL: http://svn.freebsd.org/changeset/base/192156

Log:
  MFC: Add caching of -ve lookups to the NFS client.  To prevent clients from
  not noticing new files created by another client for a "long" time, reduce
  the default timeout for caching attributes of directories from 30 seconds
  to 3 seconds.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/vfs_cache.c
  stable/7/sys/nfsclient/nfs.h
  stable/7/sys/nfsclient/nfs_vnops.c
  stable/7/sys/nfsclient/nfsnode.h
  stable/7/sys/sys/vnode.h

Modified: stable/7/sys/kern/vfs_cache.c
==============================================================================
--- stable/7/sys/kern/vfs_cache.c	Fri May 15 20:13:15 2009	(r192155)
+++ stable/7/sys/kern/vfs_cache.c	Fri May 15 20:36:54 2009	(r192156)
@@ -700,6 +700,24 @@ cache_purge(vp)
 }
 
 /*
+ * Invalidate all negative entries for a particular directory vnode.
+ */
+void
+cache_purge_negative(vp)
+	struct vnode *vp;
+{
+	struct namecache *cp, *ncp;
+
+	CTR1(KTR_VFS, "cache_purge_negative(%p)", vp);
+	CACHE_LOCK();
+	LIST_FOREACH_SAFE(cp, &vp->v_cache_src, nc_src, ncp) {
+		if (cp->nc_vp == NULL)
+			cache_zap(cp);
+	}
+	CACHE_UNLOCK();
+}
+
+/*
  * Flush all entries referencing a particular filesystem.
  */
 void

Modified: stable/7/sys/nfsclient/nfs.h
==============================================================================
--- stable/7/sys/nfsclient/nfs.h	Fri May 15 20:13:15 2009	(r192155)
+++ stable/7/sys/nfsclient/nfs.h	Fri May 15 20:36:54 2009	(r192156)
@@ -63,7 +63,7 @@
 #define	NFS_MAXATTRTIMO 60
 #endif
 #ifndef NFS_MINDIRATTRTIMO
-#define	NFS_MINDIRATTRTIMO 30		/* VDIR attrib cache timeout in sec */
+#define	NFS_MINDIRATTRTIMO 3		/* VDIR attrib cache timeout in sec */
 #endif
 #ifndef NFS_MAXDIRATTRTIMO
 #define	NFS_MAXDIRATTRTIMO 60

Modified: stable/7/sys/nfsclient/nfs_vnops.c
==============================================================================
--- stable/7/sys/nfsclient/nfs_vnops.c	Fri May 15 20:13:15 2009	(r192155)
+++ stable/7/sys/nfsclient/nfs_vnops.c	Fri May 15 20:36:54 2009	(r192156)
@@ -862,6 +862,7 @@ nfs_lookup(struct vop_lookup_args *ap)
 	struct componentname *cnp = ap->a_cnp;
 	struct vnode *dvp = ap->a_dvp;
 	struct vnode **vpp = ap->a_vpp;
+	struct vattr vattr;
 	int flags = cnp->cn_flags;
 	struct vnode *newvp;
 	struct nfsmount *nmp;
@@ -890,16 +891,20 @@ nfs_lookup(struct vop_lookup_args *ap)
 	if (error > 0 && error != ENOENT)
 		return (error);
 	if (error == -1) {
-		struct vattr vattr;
-
+		/*
+		 * We only accept a positive hit in the cache if the
+		 * change time of the file matches our cached copy.
+		 * Otherwise, we discard the cache entry and fallback
+		 * to doing a lookup RPC.
+		 */
 		newvp = *vpp;
 		if (!VOP_GETATTR(newvp, &vattr, cnp->cn_cred, td)
-		 && vattr.va_ctime.tv_sec == VTONFS(newvp)->n_ctime) {
-		     nfsstats.lookupcache_hits++;
-		     if (cnp->cn_nameiop != LOOKUP &&
-			 (flags & ISLASTCN))
-			     cnp->cn_flags |= SAVENAME;
-		     return (0);
+		    && vattr.va_ctime.tv_sec == VTONFS(newvp)->n_ctime) {
+			nfsstats.lookupcache_hits++;
+			if (cnp->cn_nameiop != LOOKUP &&
+			    (flags & ISLASTCN))
+				cnp->cn_flags |= SAVENAME;
+			return (0);
 		}
 		cache_purge(newvp);
 		if (dvp != newvp)
@@ -907,6 +912,22 @@ nfs_lookup(struct vop_lookup_args *ap)
 		else 
 			vrele(newvp);
 		*vpp = NULLVP;
+	} else if (error == ENOENT) {
+		/*
+		 * We only accept a negative hit in the cache if the
+		 * modification time of the parent directory matches
+		 * our cached copy.  Otherwise, we discard all of the
+		 * negative cache entries for this directory.
+		 */
+		if (VOP_GETATTR(dvp, &vattr, cnp->cn_cred, td) == 0 &&
+		    vattr.va_mtime.tv_sec == np->n_dmtime) {
+			nfsstats.lookupcache_hits++;
+			return (ENOENT);
+		}
+		cache_purge_negative(dvp);
+		mtx_lock(&np->n_mtx);
+		np->n_dmtime = 0;
+		mtx_unlock(&np->n_mtx);
 	}
 	error = 0;
 	newvp = NULLVP;
@@ -992,16 +1013,40 @@ nfsmout:
 			vput(newvp);
 			*vpp = NULLVP;
 		}
+
+		if (error != ENOENT)
+			goto done;
+
+		/* The requested file was not found. */
 		if ((cnp->cn_nameiop == CREATE || cnp->cn_nameiop == RENAME) &&
-		    (flags & ISLASTCN) && error == ENOENT) {
+		    (flags & ISLASTCN)) {
+			/*
+			 * XXX: UFS does a full VOP_ACCESS(dvp,
+			 * VWRITE) here instead of just checking
+			 * MNT_RDONLY.
+			 */
 			if (dvp->v_mount->mnt_flag & MNT_RDONLY)
-				error = EROFS;
-			else
-				error = EJUSTRETURN;
-		}
-		if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN))
+				return (EROFS);
 			cnp->cn_flags |= SAVENAME;
+			return (EJUSTRETURN);
+		}
+
+		if ((cnp->cn_flags & MAKEENTRY) && cnp->cn_nameiop != CREATE) {
+			/*
+			 * Maintain n_dmtime as the modification time
+			 * of the parent directory when the oldest -ve
+			 * name cache entry for this directory was
+			 * added.
+			 */
+			mtx_lock(&np->n_mtx);
+			if (np->n_dmtime == 0)
+				np->n_dmtime = np->n_vattr.va_mtime.tv_sec;
+			mtx_unlock(&np->n_mtx);
+			cache_enter(dvp, NULL, cnp);
+		}
+		return (ENOENT);
 	}
+done:
 	return (error);
 }
 

Modified: stable/7/sys/nfsclient/nfsnode.h
==============================================================================
--- stable/7/sys/nfsclient/nfsnode.h	Fri May 15 20:13:15 2009	(r192155)
+++ stable/7/sys/nfsclient/nfsnode.h	Fri May 15 20:36:54 2009	(r192156)
@@ -109,6 +109,7 @@ struct nfsnode {
 	time_t			n_modestamp;	/* mode cache timestamp */
 	struct timespec		n_mtime;	/* Prev modify time. */
 	time_t			n_ctime;	/* Prev create time. */
+	time_t			n_dmtime;	/* Prev dir modify time. */
 	time_t			n_expiry;	/* Lease expiry time */
 	nfsfh_t			*n_fhp;		/* NFS File Handle */
 	struct vnode		*n_vnode;	/* associated vnode */

Modified: stable/7/sys/sys/vnode.h
==============================================================================
--- stable/7/sys/sys/vnode.h	Fri May 15 20:13:15 2009	(r192155)
+++ stable/7/sys/sys/vnode.h	Fri May 15 20:36:54 2009	(r192156)
@@ -564,6 +564,7 @@ void	cache_enter(struct vnode *dvp, stru
 int	cache_lookup(struct vnode *dvp, struct vnode **vpp,
 	    struct componentname *cnp);
 void	cache_purge(struct vnode *vp);
+void	cache_purge_negative(struct vnode *vp);
 void	cache_purgevfs(struct mount *mp);
 int	change_dir(struct vnode *vp, struct thread *td);
 int	change_root(struct vnode *vp, struct thread *td);
From jhb at FreeBSD.org  Fri May 15 20:58:53 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Fri May 15 20:59:00 2009
Subject: svn commit: r192157 - in stable/7: sys sys/contrib/pf
	sys/dev/ath/ath_hal sys/dev/cxgb sys/kern sys/sys
	usr.bin/kdump usr.bin/ktrace
Message-ID: <200905152058.n4FKwqCL034361@svn.freebsd.org>

Author: jhb
Date: Fri May 15 20:58:52 2009
New Revision: 192157
URL: http://svn.freebsd.org/changeset/base/192157

Log:
  MFC: Add a new type of KTRACE record for sysctl(3) invocations.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_ktrace.c
  stable/7/sys/kern/kern_sysctl.c
  stable/7/sys/sys/ktrace.h
  stable/7/usr.bin/kdump/   (props changed)
  stable/7/usr.bin/kdump/kdump.1
  stable/7/usr.bin/kdump/kdump.c
  stable/7/usr.bin/ktrace/   (props changed)
  stable/7/usr.bin/ktrace/ktrace.1
  stable/7/usr.bin/ktrace/ktrace.h
  stable/7/usr.bin/ktrace/subr.c

Modified: stable/7/sys/kern/kern_ktrace.c
==============================================================================
--- stable/7/sys/kern/kern_ktrace.c	Fri May 15 20:36:54 2009	(r192156)
+++ stable/7/sys/kern/kern_ktrace.c	Fri May 15 20:58:52 2009	(r192157)
@@ -111,6 +111,7 @@ static int data_lengths[] = {
 	sizeof(struct ktr_csw),			/* KTR_CSW */
 	0,					/* KTR_USER */
 	0,					/* KTR_STRUCT */
+	0,					/* KTR_SYSCTL */
 };
 
 static STAILQ_HEAD(, ktr_request) ktr_free;
@@ -319,7 +320,7 @@ ktr_enqueuerequest(struct thread *td, st
  * is used both internally before committing other records, and also on
  * system call return.  We drain all the ones we can find at the time when
  * drain is requested, but don't keep draining after that as those events
- * may me approximately "after" the current event.
+ * may be approximately "after" the current event.
  */
 static void
 ktr_drain(struct thread *td)
@@ -481,6 +482,40 @@ ktrnamei(path)
 }
 
 void
+ktrsysctl(name, namelen)
+	int *name;
+	u_int namelen;
+{
+	struct ktr_request *req;
+	u_int mib[CTL_MAXNAME + 2];
+	char *mibname;
+	size_t mibnamelen;
+	int error;
+
+	/* Lookup name of mib. */    
+	KASSERT(namelen <= CTL_MAXNAME, ("sysctl MIB too long"));
+	mib[0] = 0;
+	mib[1] = 1;
+	bcopy(name, mib + 2, namelen * sizeof(*name));
+	mibnamelen = 128;
+	mibname = malloc(mibnamelen, M_KTRACE, M_WAITOK);
+	error = kernel_sysctl(curthread, mib, namelen + 2, mibname, &mibnamelen,
+	    NULL, 0, &mibnamelen, 0);
+	if (error) {
+		free(mibname, M_KTRACE);
+		return;
+	}
+	req = ktr_getrequest(KTR_SYSCTL);
+	if (req == NULL) {
+		free(mibname, M_KTRACE);
+		return;
+	}
+	req->ktr_header.ktr_len = mibnamelen;
+	req->ktr_buffer = mibname;
+	ktr_submitrequest(curthread, req);
+}
+
+void
 ktrgenio(fd, rw, uio, error)
 	int fd;
 	enum uio_rw rw;
@@ -925,6 +960,9 @@ ktr_writerequest(struct thread *td, stru
 	mtx_unlock(&ktrace_mtx);
 
 	kth = &req->ktr_header;
+	KASSERT(((u_short)kth->ktr_type & ~KTR_DROP) <
+	    sizeof(data_lengths) / sizeof(data_lengths[0]),
+	    ("data_lengths array overflow"));
 	datalen = data_lengths[(u_short)kth->ktr_type & ~KTR_DROP];
 	buflen = kth->ktr_len;
 	auio.uio_iov = &aiov[0];

Modified: stable/7/sys/kern/kern_sysctl.c
==============================================================================
--- stable/7/sys/kern/kern_sysctl.c	Fri May 15 20:36:54 2009	(r192156)
+++ stable/7/sys/kern/kern_sysctl.c	Fri May 15 20:58:52 2009	(r192157)
@@ -39,6 +39,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
+#include "opt_ktrace.h"
 #include "opt_mac.h"
 
 #include 
@@ -53,6 +54,9 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#ifdef KTRACE
+#include 
+#endif
 
 #include 
 
@@ -757,7 +761,7 @@ sysctl_sysctl_next(SYSCTL_HANDLER_ARGS)
 static SYSCTL_NODE(_sysctl, 2, next, CTLFLAG_RD, sysctl_sysctl_next, "");
 
 static int
-name2oid (char *name, int *oid, int *len, struct sysctl_oid **oidpp)
+name2oid(char *name, int *oid, int *len, struct sysctl_oid **oidpp)
 {
 	int i;
 	struct sysctl_oid *oidp;
@@ -1498,6 +1502,11 @@ userland_sysctl(struct thread *td, int *
 	req.newfunc = sysctl_new_user;
 	req.lock = REQ_LOCKED;
 
+#ifdef KTRACE
+	if (KTRPOINT(curthread, KTR_SYSCTL))
+		ktrsysctl(name, namelen);
+#endif
+	
 	SYSCTL_XLOCK();
 
 	for (;;) {

Modified: stable/7/sys/sys/ktrace.h
==============================================================================
--- stable/7/sys/sys/ktrace.h	Fri May 15 20:36:54 2009	(r192156)
+++ stable/7/sys/sys/ktrace.h	Fri May 15 20:58:52 2009	(r192157)
@@ -158,6 +158,12 @@ struct sockaddr;
 struct stat;
 
 /*
+ * KTR_SYSCTL - name of a sysctl MIB
+ */
+#define	KTR_SYSCTL	9
+	/* record contains null-terminated MIB name */
+
+/*
  * KTR_DROP - If this bit is set in ktr_type, then at least one event
  * between the previous record and this record was dropped.
  */
@@ -175,6 +181,8 @@ struct stat;
 #define KTRFAC_CSW	(1<ktr_type);
 		type = unknown;

Modified: stable/7/usr.bin/ktrace/ktrace.1
==============================================================================
--- stable/7/usr.bin/ktrace/ktrace.1	Fri May 15 20:36:54 2009	(r192156)
+++ stable/7/usr.bin/ktrace/ktrace.1	Fri May 15 20:58:52 2009	(r192157)
@@ -125,6 +125,10 @@ trace various structures
 userland traces
 .It Cm w
 context switches
+.It Cm y
+trace
+.Xr sysctl 3
+requests
 .It Cm +
 trace the default set of trace points -
 .Cm c , n , i , s , t , u

Modified: stable/7/usr.bin/ktrace/ktrace.h
==============================================================================
--- stable/7/usr.bin/ktrace/ktrace.h	Fri May 15 20:36:54 2009	(r192156)
+++ stable/7/usr.bin/ktrace/ktrace.h	Fri May 15 20:58:52 2009	(r192157)
@@ -35,7 +35,8 @@
  */
 
 #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \
-		  KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_USER | KTRFAC_STRUCT)
+		    KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_USER | \
+		    KTRFAC_STRUCT | KTRFAC_SYSCTL)
 
 #define ALL_POINTS (DEF_POINTS | KTRFAC_CSW)
 

Modified: stable/7/usr.bin/ktrace/subr.c
==============================================================================
--- stable/7/usr.bin/ktrace/subr.c	Fri May 15 20:36:54 2009	(r192156)
+++ stable/7/usr.bin/ktrace/subr.c	Fri May 15 20:58:52 2009	(r192157)
@@ -83,6 +83,9 @@ getpoints(char *s)
 		case 'w':
 			facs |= KTRFAC_CSW;
 			break;
+		case 'y':
+			facs |= KTRFAC_SYSCTL;
+			break;
 		case '+':
 			facs |= DEF_POINTS;
 			break;
From kib at FreeBSD.org  Sat May 16 17:15:27 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Sat May 16 17:15:34 2009
Subject: svn commit: r192200 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb ufs/ufs
Message-ID: <200905161715.n4GHFQvU064896@svn.freebsd.org>

Author: kib
Date: Sat May 16 17:15:26 2009
New Revision: 192200
URL: http://svn.freebsd.org/changeset/base/192200

Log:
  MFC r191137:
  Verify that '..' still exists with the same inode number after
  VFS_VGET() has returned in ufs_lookup().
  
  MFC r191260:
  When verifying '..' after VFS_VGET() in ufs_lookup(), do not return
  error if '..' is still there but changed between lookup and check.
  Start relookup instead.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/ufs/ufs/ufs_lookup.c

Modified: stable/7/sys/ufs/ufs/ufs_lookup.c
==============================================================================
--- stable/7/sys/ufs/ufs/ufs_lookup.c	Sat May 16 15:21:08 2009	(r192199)
+++ stable/7/sys/ufs/ufs/ufs_lookup.c	Sat May 16 17:15:26 2009	(r192200)
@@ -77,6 +77,9 @@ SYSCTL_INT(_debug, OID_AUTO, dircheck, C
 /* true if old FS format...*/
 #define OFSFMT(vp)	((vp)->v_mount->mnt_maxsymlinklen <= 0)
 
+static int ufs_lookup_(struct vnode *, struct vnode **, struct componentname *,
+    ino_t *);
+
 /*
  * Convert a component of a pathname into a pointer to a locked inode.
  * This is a very central and rather complicated routine.
@@ -130,7 +133,14 @@ ufs_lookup(ap)
 		struct componentname *a_cnp;
 	} */ *ap;
 {
-	struct vnode *vdp;		/* vnode for directory being searched */
+
+	return (ufs_lookup_(ap->a_dvp, ap->a_vpp, ap->a_cnp, NULL));
+}
+
+static int
+ufs_lookup_(struct vnode *vdp, struct vnode **vpp, struct componentname *cnp,
+    ino_t *dd_ino)
+{
 	struct inode *dp;		/* inode for directory being searched */
 	struct buf *bp;			/* a buffer of directory entries */
 	struct direct *ep;		/* the current directory entry */
@@ -150,24 +160,16 @@ ufs_lookup(ap)
 	doff_t enduseful;		/* pointer past last used dir slot */
 	u_long bmask;			/* block offset mask */
 	int namlen, error;
-	struct vnode **vpp = ap->a_vpp;
-	struct componentname *cnp = ap->a_cnp;
 	struct ucred *cred = cnp->cn_cred;
 	int flags = cnp->cn_flags;
 	int nameiop = cnp->cn_nameiop;
 	struct thread *td = cnp->cn_thread;
-	ino_t ino;
+	ino_t ino, ino1;
 	int ltype;
 
-	bp = NULL;
-	slotoffset = -1;
-/*
- *  XXX there was a soft-update diff about this I couldn't merge.
- * I think this was the equiv.
- */
-	*vpp = NULL;
+	if (vpp != NULL)
+		*vpp = NULL;
 
-	vdp = ap->a_dvp;
 	dp = VTOI(vdp);
 
 	/*
@@ -178,6 +180,12 @@ ufs_lookup(ap)
 	 */
 	vnode_create_vobject(vdp, DIP(dp, i_size), cnp->cn_thread);
 
+	bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;
+
+restart:
+	bp = NULL;
+	slotoffset = -1;
+
 	/*
 	 * We now have a segment name to search for, and a directory to search.
 	 *
@@ -195,7 +203,6 @@ ufs_lookup(ap)
 		slotstatus = NONE;
 		slotneeded = DIRECTSIZ(cnp->cn_namelen);
 	}
-	bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;
 
 #ifdef UFS_DIRHASH
 	/*
@@ -364,7 +371,7 @@ foundentry:
 					slotoffset = i_offset;
 					slotsize = ep->d_reclen;
 					enduseful = dp->i_size;
-					ap->a_cnp->cn_flags |= ISWHITEOUT;
+					cnp->cn_flags |= ISWHITEOUT;
 					numdirpasses--;
 					goto notfound;
 				}
@@ -398,8 +405,8 @@ notfound:
 	 */
 	if ((nameiop == CREATE || nameiop == RENAME ||
 	     (nameiop == DELETE &&
-	      (ap->a_cnp->cn_flags & DOWHITEOUT) &&
-	      (ap->a_cnp->cn_flags & ISWHITEOUT))) &&
+	      (cnp->cn_flags & DOWHITEOUT) &&
+	      (cnp->cn_flags & ISWHITEOUT))) &&
 	    (flags & ISLASTCN) && dp->i_effnlink != 0) {
 		/*
 		 * Access for write is interpreted as allowing
@@ -454,7 +461,7 @@ notfound:
 	 * Insert name into cache (as non-existent) if appropriate.
 	 */
 	if ((cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
-		cache_enter(vdp, *vpp, cnp);
+		cache_enter(vdp, NULL, cnp);
 	return (ENOENT);
 
 found:
@@ -480,6 +487,11 @@ found:
 	if ((flags & ISLASTCN) && nameiop == LOOKUP)
 		dp->i_diroff = i_offset &~ (DIRBLKSIZ - 1);
 
+	if (dd_ino != NULL) {
+		*dd_ino = ino;
+		return (0);
+	}
+
 	/*
 	 * If deleting, and at end of pathname, return
 	 * parameters which can be used to remove file.
@@ -581,6 +593,22 @@ found:
 		error = vn_vget_ino(pdp, ino, cnp->cn_lkflags, &tdp);
 		if (error)
 			return (error);
+
+		/*
+		 * Recheck that ".." entry in the vdp directory points
+		 * to the inode we looked up before vdp lock was
+		 * dropped.
+		 */
+		error = ufs_lookup_(pdp, NULL, cnp, &ino1);
+		if (error) {
+			vput(tdp);
+			return (error);
+		}
+		if (ino1 != ino) {
+			vput(tdp);
+			goto restart;
+		}
+
 		*vpp = tdp;
 	} else if (dp->i_number == ino) {
 		VREF(vdp);	/* we want ourself, ie "." */
From kib at FreeBSD.org  Sat May 16 17:22:05 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Sat May 16 17:22:16 2009
Subject: svn commit: r192201 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb ufs/ufs
Message-ID: <200905161722.n4GHM3CS065067@svn.freebsd.org>

Author: kib
Date: Sat May 16 17:22:03 2009
New Revision: 192201
URL: http://svn.freebsd.org/changeset/base/192201

Log:
  MFC r191315:
  In ufs_checkpath(), recheck that '..' still points to the inode with
  the same inode number after VFS_VGET() and relock of the vp. If '..'
  changed, redo the lookup.
  
  Supply the source inode number as an argument to ufs_checkpath() instead
  of the source inode itself.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/ufs/ufs/ufs_extern.h
  stable/7/sys/ufs/ufs/ufs_lookup.c
  stable/7/sys/ufs/ufs/ufs_vnops.c

Modified: stable/7/sys/ufs/ufs/ufs_extern.h
==============================================================================
--- stable/7/sys/ufs/ufs/ufs_extern.h	Sat May 16 17:15:26 2009	(r192200)
+++ stable/7/sys/ufs/ufs/ufs_extern.h	Sat May 16 17:22:03 2009	(r192201)
@@ -58,7 +58,7 @@ int	 ufs_bmap(struct vop_bmap_args *);
 int	 ufs_bmaparray(struct vnode *, ufs2_daddr_t, ufs2_daddr_t *,
 	    struct buf *, int *, int *);
 int	 ufs_fhtovp(struct mount *, struct ufid *, struct vnode **);
-int	 ufs_checkpath(struct inode *, struct inode *, struct ucred *);
+int	 ufs_checkpath(ino_t, struct inode *, struct ucred *);
 void	 ufs_dirbad(struct inode *, doff_t, char *);
 int	 ufs_dirbadentry(struct vnode *, struct direct *, int);
 int	 ufs_dirempty(struct inode *, ino_t, struct ucred *);

Modified: stable/7/sys/ufs/ufs/ufs_lookup.c
==============================================================================
--- stable/7/sys/ufs/ufs/ufs_lookup.c	Sat May 16 17:15:26 2009	(r192200)
+++ stable/7/sys/ufs/ufs/ufs_lookup.c	Sat May 16 17:22:03 2009	(r192201)
@@ -1238,69 +1238,81 @@ ufs_dirempty(ip, parentino, cred)
 	return (1);
 }
 
+static int
+ufs_dir_dd_ino(struct vnode *vp, struct ucred *cred, ino_t *dd_ino)
+{
+	struct dirtemplate dirbuf;
+	int error, namlen;
+
+	if (vp->v_type != VDIR)
+		return (ENOTDIR);
+	error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf,
+	    sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE,
+	    IO_NODELOCKED | IO_NOMACCHECK, cred, NOCRED, (int *)0, NULL);
+	if (error != 0)
+		return (error);
+#if (BYTE_ORDER == LITTLE_ENDIAN)
+	if (OFSFMT(vp))
+		namlen = dirbuf.dotdot_type;
+	else
+		namlen = dirbuf.dotdot_namlen;
+#else
+	namlen = dirbuf.dotdot_namlen;
+#endif
+	if (namlen != 2 || dirbuf.dotdot_name[0] != '.' ||
+	    dirbuf.dotdot_name[1] != '.')
+		return (ENOTDIR);
+	*dd_ino = dirbuf.dotdot_ino;
+	return (0);
+}
+
 /*
  * Check if source directory is in the path of the target directory.
  * Target is supplied locked, source is unlocked.
  * The target is always vput before returning.
  */
 int
-ufs_checkpath(source, target, cred)
-	struct inode *source, *target;
-	struct ucred *cred;
+ufs_checkpath(ino_t source_ino, struct inode *target, struct ucred *cred)
 {
-	struct vnode *vp;
-	int error, namlen;
-	ino_t rootino;
-	struct dirtemplate dirbuf;
+	struct vnode *vp, *vp1;
+	int error;
+	ino_t dd_ino;
 
 	vp = ITOV(target);
-	if (target->i_number == source->i_number) {
+	if (target->i_number == source_ino) {
 		error = EEXIST;
 		goto out;
 	}
-	rootino = ROOTINO;
 	error = 0;
-	if (target->i_number == rootino)
+	if (target->i_number == ROOTINO)
 		goto out;
 
 	for (;;) {
-		if (vp->v_type != VDIR) {
-			error = ENOTDIR;
-			break;
-		}
-		error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf,
-			sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE,
-			IO_NODELOCKED | IO_NOMACCHECK, cred, NOCRED, (int *)0,
-			(struct thread *)0);
+		error = ufs_dir_dd_ino(vp, cred, &dd_ino);
 		if (error != 0)
 			break;
-#		if (BYTE_ORDER == LITTLE_ENDIAN)
-			if (OFSFMT(vp))
-				namlen = dirbuf.dotdot_type;
-			else
-				namlen = dirbuf.dotdot_namlen;
-#		else
-			namlen = dirbuf.dotdot_namlen;
-#		endif
-		if (namlen != 2 ||
-		    dirbuf.dotdot_name[0] != '.' ||
-		    dirbuf.dotdot_name[1] != '.') {
-			error = ENOTDIR;
-			break;
-		}
-		if (dirbuf.dotdot_ino == source->i_number) {
+		if (dd_ino == source_ino) {
 			error = EINVAL;
 			break;
 		}
-		if (dirbuf.dotdot_ino == rootino)
+		if (dd_ino == ROOTINO)
 			break;
-		vput(vp);
-		error = VFS_VGET(vp->v_mount, dirbuf.dotdot_ino,
-		    LK_EXCLUSIVE, &vp);
-		if (error) {
-			vp = NULL;
+		error = vn_vget_ino(vp, dd_ino, LK_EXCLUSIVE, &vp1);
+		if (error != 0)
+			break;
+		/* Recheck that ".." still points to vp1 after relock of vp */
+		error = ufs_dir_dd_ino(vp, cred, &dd_ino);
+		if (error != 0) {
+			vput(vp1);
 			break;
 		}
+		/* Redo the check of ".." if directory was reparented */
+		if (dd_ino != VTOI(vp1)->i_number) {
+			vput(vp1);
+			continue;
+		}
+		vput(vp);
+		vp = vp1;
 	}
 
 out:

Modified: stable/7/sys/ufs/ufs/ufs_vnops.c
==============================================================================
--- stable/7/sys/ufs/ufs/ufs_vnops.c	Sat May 16 17:15:26 2009	(r192200)
+++ stable/7/sys/ufs/ufs/ufs_vnops.c	Sat May 16 17:22:03 2009	(r192201)
@@ -1029,6 +1029,7 @@ ufs_rename(ap)
 	struct direct newdir;
 	int doingdirectory = 0, oldparent = 0, newparent = 0;
 	int error = 0, ioflag;
+	ino_t fvp_ino;
 
 #ifdef INVARIANTS
 	if ((tcnp->cn_flags & HASBUF) == 0 ||
@@ -1139,6 +1140,7 @@ abortit:
 	 * call to checkpath().
 	 */
 	error = VOP_ACCESS(fvp, VWRITE, tcnp->cn_cred, tcnp->cn_thread);
+	fvp_ino = ip->i_number;
 	VOP_UNLOCK(fvp, 0, td);
 	if (oldparent != dp->i_number)
 		newparent = dp->i_number;
@@ -1147,7 +1149,7 @@ abortit:
 			goto bad;
 		if (xp != NULL)
 			vput(tvp);
-		error = ufs_checkpath(ip, dp, tcnp->cn_cred);
+		error = ufs_checkpath(fvp_ino, dp, tcnp->cn_cred);
 		if (error)
 			goto out;
 		if ((tcnp->cn_flags & SAVESTART) == 0)
From fabient at FreeBSD.org  Sun May 17 11:45:39 2009
From: fabient at FreeBSD.org (Fabien Thomas)
Date: Sun May 17 11:45:55 2009
Subject: svn commit: r192248 - stable/7/lib/libpmc
Message-ID: <200905171145.n4HBjbQC026986@svn.freebsd.org>

Author: fabient
Date: Sun May 17 11:45:37 2009
New Revision: 192248
URL: http://svn.freebsd.org/changeset/base/192248

Log:
  MFC 190395: Allow compile from c++ for libpmc
  
  Reviewed by: jkoshy (mentor)

Modified:
  stable/7/lib/libpmc/   (props changed)
  stable/7/lib/libpmc/pmc.h
  stable/7/lib/libpmc/pmclog.h

Modified: stable/7/lib/libpmc/pmc.h
==============================================================================
--- stable/7/lib/libpmc/pmc.h	Sun May 17 10:58:50 2009	(r192247)
+++ stable/7/lib/libpmc/pmc.h	Sun May 17 11:45:37 2009	(r192248)
@@ -29,6 +29,7 @@
 #ifndef _PMC_H_
 #define _PMC_H_
 
+#include 
 #include 
 
 /*
@@ -68,6 +69,7 @@ struct pmc_pmcinfo {
  * Prototypes
  */
 
+__BEGIN_DECLS
 int	pmc_allocate(const char *_ctrspec, enum pmc_mode _mode, uint32_t _flags,
     int _cpu, pmc_id_t *_pmcid);
 int	pmc_attach(pmc_id_t _pmcid, pid_t _pid);
@@ -105,5 +107,6 @@ const char	*pmc_name_of_state(enum pmc_s
 
 int	pmc_event_names_of_class(enum pmc_class _cl, const char ***_eventnames,
     int *_nevents);
+__END_DECLS
 
 #endif

Modified: stable/7/lib/libpmc/pmclog.h
==============================================================================
--- stable/7/lib/libpmc/pmclog.h	Sun May 17 10:58:50 2009	(r192247)
+++ stable/7/lib/libpmc/pmclog.h	Sun May 17 11:45:37 2009	(r192248)
@@ -29,6 +29,7 @@
 #ifndef	_PMCLOG_H_
 #define	_PMCLOG_H_
 
+#include 
 #include 
 
 enum pmclog_state {
@@ -145,10 +146,12 @@ struct pmclog_ev {
 
 #define	PMCLOG_FD_NONE				(-1)
 
+__BEGIN_DECLS
 void	*pmclog_open(int _fd);
 int	pmclog_feed(void *_cookie, char *_data, int _len);
 int	pmclog_read(void *_cookie, struct pmclog_ev *_ev);
 void	pmclog_close(void *_cookie);
+__END_DECLS
 
 #endif
 
From bms at FreeBSD.org  Sun May 17 15:42:42 2009
From: bms at FreeBSD.org (Bruce M Simpson)
Date: Sun May 17 15:42:53 2009
Subject: svn commit: r192251 - stable/7/lib/libc/net
Message-ID: <200905171542.n4HFgfqj031720@svn.freebsd.org>

Author: bms
Date: Sun May 17 15:42:41 2009
New Revision: 192251
URL: http://svn.freebsd.org/changeset/base/192251

Log:
  MFC rev 191654:
  Fix an obvious bug in getsourcefilter()'s use of struct __msfilterreq;
  the kernel will return in msfr_nsrcs the number of source filters
  in-mode for a given multicast group.
  However, the filters themselves were never copied out, as the libc
  function clobbers this field with zero, causing the kernel to assume
  the provided vector of struct sockaddr_storage has zero length.
  This bug would only affect users of SSM multicast, which is shimmed
  in 7.x.
  Picked up during mtest(8) refactoring.

Modified:
  stable/7/lib/libc/net/sourcefilter.c

Modified: stable/7/lib/libc/net/sourcefilter.c
==============================================================================
--- stable/7/lib/libc/net/sourcefilter.c	Sun May 17 12:30:25 2009	(r192250)
+++ stable/7/lib/libc/net/sourcefilter.c	Sun May 17 15:42:41 2009	(r192251)
@@ -1,6 +1,6 @@
 /*-
- * Copyright (c) 2007 Bruce M. Simpson.
- * All rights reserved
+ * Copyright (c) 2007-2009 Bruce Simpson.
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,21 +10,18 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of Bruce M. Simpson nor the names of other
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY BRUCE M. SIMPSON AND AFFILIATES
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL BRUCE M. SIMPSON OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #include 
@@ -340,7 +337,7 @@ getsourcefilter(int s, uint32_t interfac
 {
 	struct __msfilterreq	 msfr;
 	sockunion_t		*psu;
-	int			 err, level, optlen, optname;
+	int			 err, level, nsrcs, optlen, optname;
 
 	if (interface == 0 || group == NULL || numsrc == NULL ||
 	    fmode == NULL) {
@@ -348,6 +345,7 @@ getsourcefilter(int s, uint32_t interfac
 		return (-1);
 	}
 
+	nsrcs = *numsrc;
 	*numsrc = 0;
 	*fmode = 0;
 
@@ -385,7 +383,7 @@ getsourcefilter(int s, uint32_t interfac
 	memset(&msfr, 0, optlen);
 	msfr.msfr_ifindex = interface;
 	msfr.msfr_fmode = 0;
-	msfr.msfr_nsrcs = *numsrc;
+	msfr.msfr_nsrcs = nsrcs;
 	memcpy(&msfr.msfr_group, &psu->ss, psu->ss.ss_len);
 
 	/*
From bms at incunabulum.net  Sun May 17 16:16:05 2009
From: bms at incunabulum.net (Bruce Simpson)
Date: Sun May 17 16:16:18 2009
Subject: svn commit: r192033 - stable/7/sys/dev/ata
In-Reply-To: <4A0D7B50.4090602@FreeBSD.org>
References: <200905130255.n4D2tMQZ040010@svn.freebsd.org>
	<4A0CF9EA.6080403@FreeBSD.org> <4A0D7B50.4090602@FreeBSD.org>
Message-ID: <4A103429.8040906@incunabulum.net>

Alexander Motin wrote:
> Bruce Simpson wrote:
>> Could this commit have broken boot on my amd64 system with an ULi 
>> SATA controller?
>
> This commit could change driver used for controller and so expose some 
> other bug in ALI driver. As I can see, there is present 
> vendor-specific driver for this chip, but without pciconf output I 
> can't say if AHCI driver is also able to attach it.

...
isab0@pci0:0:30:0:      class=0x060100 card=0x81561043 chip=0x157310b9 
rev=0x31 hdr=0x00
    vendor     = 'Acer Labs Incorporated (ALi/ULi)'
    device     = 'ALI M1573 South Bridge with Hypertransport Support'
    class      = bridge
    subclass   = PCI-ISA
none0@pci0:0:30:1:      class=0x068000 card=0x81561043 chip=0x710110b9 
rev=0x00 hdr=0x00
    vendor     = 'Acer Labs Incorporated (ALi/ULi)'
    device     = 'ALI M7101 Power Management Controller'
    class      = bridge
atapci0@pci0:0:31:0:    class=0x01018a card=0x81561043 chip=0x522910b9 
rev=0xc7 hdr=0x00
    vendor     = 'Acer Labs Incorporated (ALi/ULi)'
    device     = 'M5229 Southbridge EIDE Controller'
    class      = mass storage
    subclass   = ATA
atapci1@pci0:0:31:1:    class=0x010400 card=0x81561043 chip=0x528710b9 
rev=0x02 hdr=0x00
    vendor     = 'Acer Labs Incorporated (ALi/ULi)'
    device     = '52871849 ALI SATA controller'
    class      = mass storage
    subclass   = RAID

... FreeBSD boots from ad4.

anglepoise:~ % devinfo
nexus0
  apic0
  ram0
  acpi0
    cpu0
      acpi_throttle0
      cpufreq0
    pcib0
      pci0
        hostb0
        pcib1
          pci1
            vgapci0
            vgapci1
        pcib2
          pci2
            mskc0
              msk0
                miibus0
                  e1000phy0
        pcib3
          pci3
        hostb1
        hostb2
        hostb3
        hostb4
        pcib4
          pci4
        ohci0
          usb0
            uhub0
        ohci1
          usb1
            uhub1
              uhub4
                ums0
        ohci2
          usb2
            uhub2
        ehci0
          usb3
            uhub3
        hdac0
          pcm0
          pcm1
          pcm2
        isab0
          isa0
            sc0
            vga0
            orm0
        atapci0
          ata0
            ad0
              subdisk0
          ata1
            acd0
        atapci1
          ata2
            ad4
              subdisk4
          ata3
          ata4
          ata5
    atpic0
    atdma0
    attimer0
    attimer1
    fpupnp0
    fdc0
      fd0
    ppc0
      ppbus0
    acpi_sysresource0
    atkbdc0
      atkbd0
    acpi_sysresource1
    sio0
    acpi_sysresource2
    acpi_sysresource3
    acpi_sysresource4
    acpi_button0
    pci_link0
    pci_link1
    pci_link2
    pci_link3
    pci_link4
    pci_link5
    pci_link6
    pci_link7
    pci_link8
    acpi_timer0


>
>> I have not fully bisected (and to be honest, who really has time to 
>> do this for production machines, unless
>>
>> The panic I get with RELENG_7 sources as of yesterday after this 
>> commit is 'resource list busy'. If you need any more information let 
>> me know, I have transcribed the backtrace and posted it to stable@.
>
> Which revision was working for you before this? If, as you have said, 
> reverting rev 192033 does not helped, then there should be something 
> different. May be not in ATA, as there was very few merges into 
> 7-STABLE ATA last months.

anglepoise:~ % uname -a
FreeBSD anglepoise.lon.incunabulum.net 7.2-PRERELEASE FreeBSD 
7.2-PRERELEASE #1: Tue Apr 21 07:41:58 BST 2009     
root@anglepoise.lon.incunabulum.net:/home/obj/usr/src/sys/ANGLEPOISE  amd64

anglepoise:~ % ident /boot/kernel/kernel | grep ata
     $FreeBSD: src/sys/cam/cam_queue.c,v 1.9 2005/07/01 15:21:29 avatar 
Exp $
     $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.280.2.8 2009/03/03 08:14:43 
mav Exp $
     $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.202.2.19 2009/03/25 
14:26:38 mav Exp $
     $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.204.2.3 2008/04/08 
10:48:21 phk Exp $
     $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.147.2.2 2008/01/09 08:54:47 
delphij Exp $
     $FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.31 2007/02/21 19:07:18 sos 
Exp $
     $FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.79.2.1 2008/01/09 
08:54:48 delphij Exp $
     $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.121.2.2 2007/11/21 21:15:00 
sos Exp $
     $FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.69.2.1 2009/03/03 
08:14:43 mav Exp $
     $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.124.2.1 2009/03/01 
16:50:46 scottl Exp $
     $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.193.2.3 2009/03/17 
19:38:40 marcel Exp $
     $FreeBSD: src/sys/dev/puc/pucdata.c,v 1.59.2.6 2009/03/19 15:35:33 
jhb Exp $

Let me know if you need any more info...

cheers
BMS
From mav at FreeBSD.org  Sun May 17 22:57:44 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Sun May 17 22:57:56 2009
Subject: svn commit: r192033 - stable/7/sys/dev/ata
In-Reply-To: <4A103429.8040906@incunabulum.net>
References: <200905130255.n4D2tMQZ040010@svn.freebsd.org>
	<4A0CF9EA.6080403@FreeBSD.org> <4A0D7B50.4090602@FreeBSD.org>
	<4A103429.8040906@incunabulum.net>
Message-ID: <4A109662.9060909@FreeBSD.org>

Bruce Simpson wrote:
> Alexander Motin wrote:
>> Bruce Simpson wrote:
>>> Could this commit have broken boot on my amd64 system with an ULi 
>>> SATA controller?
>>
>> This commit could change driver used for controller and so expose some 
>> other bug in ALI driver. As I can see, there is present 
>> vendor-specific driver for this chip, but without pciconf output I 
>> can't say if AHCI driver is also able to attach it.
> 
> atapci1@pci0:0:31:1:    class=0x010400 card=0x81561043 chip=0x528710b9 
> rev=0x02 hdr=0x00
>    vendor     = 'Acer Labs Incorporated (ALi/ULi)'
>    device     = '52871849 ALI SATA controller'
>    class      = mass storage
>    subclass   = RAID

This change is not anyhow related to your system. Looks like the real 
reason found by jhb@ on stable@. Probably something become more strict 
in system resource management last time and this driver violates now.

-- 
Alexander Motin
From bms at incunabulum.net  Sun May 17 23:52:08 2009
From: bms at incunabulum.net (Bruce Simpson)
Date: Sun May 17 23:52:25 2009
Subject: svn commit: r192033 - stable/7/sys/dev/ata
In-Reply-To: <4A109662.9060909@FreeBSD.org>
References: <200905130255.n4D2tMQZ040010@svn.freebsd.org>
	<4A0CF9EA.6080403@FreeBSD.org> <4A0D7B50.4090602@FreeBSD.org>
	<4A103429.8040906@incunabulum.net> <4A109662.9060909@FreeBSD.org>
Message-ID: <4A10A324.5040501@incunabulum.net>

Alexander Motin wrote:
> ...
> This change is not anyhow related to your system. Looks like the real 
> reason found by jhb@ on stable@. Probably something become more strict 
> in system resource management last time and this driver violates now.
>

Thanks... I reckon John is probably on the money with this but have not 
looked closely. Hopefully the fix is backportable... I will try to find 
time to test HEAD, I need to do some HEAD testing on this box anyway, 
using a USB key is possible for this with NanoBSD now :-)

cheers,
BMS
From alc at FreeBSD.org  Mon May 18 07:24:07 2009
From: alc at FreeBSD.org (Alan Cox)
Date: Mon May 18 07:24:18 2009
Subject: svn commit: r192300 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern vm
Message-ID: <200905180724.n4I7O6MO053640@svn.freebsd.org>

Author: alc
Date: Mon May 18 07:24:06 2009
New Revision: 192300
URL: http://svn.freebsd.org/changeset/base/192300

Log:
  MFC r180308
    Enable the creation of a kmem map larger than 4GB.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_malloc.c
  stable/7/sys/vm/vm_kern.h

Modified: stable/7/sys/kern/kern_malloc.c
==============================================================================
--- stable/7/sys/kern/kern_malloc.c	Mon May 18 07:13:42 2009	(r192299)
+++ stable/7/sys/kern/kern_malloc.c	Mon May 18 07:24:06 2009	(r192300)
@@ -181,19 +181,19 @@ struct {
  */
 static uma_zone_t mt_zone;
 
-u_int vm_kmem_size;
-SYSCTL_UINT(_vm, OID_AUTO, kmem_size, CTLFLAG_RD, &vm_kmem_size, 0,
+u_long vm_kmem_size;
+SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RD, &vm_kmem_size, 0,
     "Size of kernel memory");
 
-u_int vm_kmem_size_min;
-SYSCTL_UINT(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RD, &vm_kmem_size_min, 0,
+static u_long vm_kmem_size_min;
+SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RD, &vm_kmem_size_min, 0,
     "Minimum size of kernel memory");
 
-u_int vm_kmem_size_max;
-SYSCTL_UINT(_vm, OID_AUTO, kmem_size_max, CTLFLAG_RD, &vm_kmem_size_max, 0,
+static u_long vm_kmem_size_max;
+SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_max, CTLFLAG_RD, &vm_kmem_size_max, 0,
     "Maximum size of kernel memory");
 
-u_int vm_kmem_size_scale;
+static u_int vm_kmem_size_scale;
 SYSCTL_UINT(_vm, OID_AUTO, kmem_size_scale, CTLFLAG_RD, &vm_kmem_size_scale, 0,
     "Scale factor for kernel memory size");
 
@@ -589,7 +589,7 @@ kmeminit(void *dummy)
 #if defined(VM_KMEM_SIZE_MIN)
 	vm_kmem_size_min = VM_KMEM_SIZE_MIN;
 #endif
-	TUNABLE_INT_FETCH("vm.kmem_size_min", &vm_kmem_size_min);
+	TUNABLE_ULONG_FETCH("vm.kmem_size_min", &vm_kmem_size_min);
 	if (vm_kmem_size_min > 0 && vm_kmem_size < vm_kmem_size_min) {
 		vm_kmem_size = vm_kmem_size_min;
 	}
@@ -597,16 +597,16 @@ kmeminit(void *dummy)
 #if defined(VM_KMEM_SIZE_MAX)
 	vm_kmem_size_max = VM_KMEM_SIZE_MAX;
 #endif
-	TUNABLE_INT_FETCH("vm.kmem_size_max", &vm_kmem_size_max);
+	TUNABLE_ULONG_FETCH("vm.kmem_size_max", &vm_kmem_size_max);
 	if (vm_kmem_size_max > 0 && vm_kmem_size >= vm_kmem_size_max)
 		vm_kmem_size = vm_kmem_size_max;
 
 	/* Allow final override from the kernel environment */
 #ifndef BURN_BRIDGES
-	if (TUNABLE_INT_FETCH("kern.vm.kmem.size", &vm_kmem_size) != 0)
+	if (TUNABLE_ULONG_FETCH("kern.vm.kmem.size", &vm_kmem_size) != 0)
 		printf("kern.vm.kmem.size is now called vm.kmem_size!\n");
 #endif
-	TUNABLE_INT_FETCH("vm.kmem_size", &vm_kmem_size);
+	TUNABLE_ULONG_FETCH("vm.kmem_size", &vm_kmem_size);
 
 	/*
 	 * Limit kmem virtual size to twice the physical memory.

Modified: stable/7/sys/vm/vm_kern.h
==============================================================================
--- stable/7/sys/vm/vm_kern.h	Mon May 18 07:13:42 2009	(r192299)
+++ stable/7/sys/vm/vm_kern.h	Mon May 18 07:24:06 2009	(r192300)
@@ -69,6 +69,6 @@ extern vm_map_t kernel_map;
 extern vm_map_t kmem_map;
 extern vm_map_t exec_map;
 extern vm_map_t pipe_map;
-extern u_int vm_kmem_size;
+extern u_long vm_kmem_size;
 
 #endif				/* _VM_VM_KERN_H_ */
From kib at FreeBSD.org  Mon May 18 08:42:01 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Mon May 18 08:42:11 2009
Subject: svn commit: r192301 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb fs/devfs
Message-ID: <200905180842.n4I8g0hF055224@svn.freebsd.org>

Author: kib
Date: Mon May 18 08:41:59 2009
New Revision: 192301
URL: http://svn.freebsd.org/changeset/base/192301

Log:
  MFC r192151:
  Initialize f_vnode before calling d_fdopen() cdevsw method.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/fs/devfs/devfs_vnops.c

Modified: stable/7/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- stable/7/sys/fs/devfs/devfs_vnops.c	Mon May 18 07:24:06 2009	(r192300)
+++ stable/7/sys/fs/devfs/devfs_vnops.c	Mon May 18 08:41:59 2009	(r192301)
@@ -890,6 +890,7 @@ devfs_open(struct vop_open_args *ap)
 	if (fp != NULL) {
 		FILE_LOCK(fp);
 		fp->f_data = dev;
+		fp->f_vnode = vp;
 		FILE_UNLOCK(fp);
 	}
 	fpop = td->td_fpop;
From jhb at FreeBSD.org  Mon May 18 17:14:25 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Mon May 18 17:14:37 2009
Subject: svn commit: r192311 - in stable/7/sys: . amd64/amd64 arm/arm
	contrib/pf dev/ath/ath_hal dev/cxgb i386/i386 ia64/ia64 kern
	powerpc/powerpc sparc64/sparc64 sys
Message-ID: <200905181714.n4IHEN1o068422@svn.freebsd.org>

Author: jhb
Date: Mon May 18 17:14:23 2009
New Revision: 192311
URL: http://svn.freebsd.org/changeset/base/192311

Log:
  MFC: Simplify the interrupt code a bit by always including the ie_disable
  and ie_eoi methods and collapsing down to a single intr_event_create()
  routine.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/intr_machdep.c
  stable/7/sys/arm/arm/intr.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/i386/intr_machdep.c
  stable/7/sys/ia64/ia64/interrupt.c
  stable/7/sys/kern/kern_intr.c
  stable/7/sys/powerpc/powerpc/intr_machdep.c
  stable/7/sys/sparc64/sparc64/intr_machdep.c
  stable/7/sys/sys/interrupt.h

Modified: stable/7/sys/amd64/amd64/intr_machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/intr_machdep.c	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/amd64/amd64/intr_machdep.c	Mon May 18 17:14:23 2009	(r192311)
@@ -77,12 +77,6 @@ static struct sx intr_table_lock;
 static struct mtx intrcnt_lock;
 static STAILQ_HEAD(, pic) pics;
 
-#ifdef INTR_FILTER
-static void intr_eoi_src(void *arg);
-static void intr_disab_eoi_src(void *arg);
-static void intr_event_stray(void *cookie);
-#endif
-
 #ifdef SMP
 static int assign_cpu;
 
@@ -90,6 +84,10 @@ static void	intr_assign_next_cpu(struct 
 #endif
 
 static int	intr_assign_cpu(void *arg, u_char cpu);
+static void	intr_disable_src(void *arg);
+#ifdef INTR_FILTER
+static void	intr_event_stray(void *cookie);
+#endif
 static void	intr_init(void *__dummy);
 static int	intr_pic_registered(struct pic *pic);
 static void	intrcnt_setname(const char *name, int index);
@@ -144,16 +142,10 @@ intr_register_source(struct intsrc *isrc
 	vector = isrc->is_pic->pic_vector(isrc);
 	if (interrupt_sources[vector] != NULL)
 		return (EEXIST);
-#ifdef INTR_FILTER
-	error = intr_event_create(&isrc->is_event, isrc, 0,
-	    (mask_fn)isrc->is_pic->pic_enable_source,
-	    intr_eoi_src, intr_disab_eoi_src, intr_assign_cpu, "irq%d:",
-	    vector);
-#else
 	error = intr_event_create(&isrc->is_event, isrc, 0,
-	    (mask_fn)isrc->is_pic->pic_enable_source, intr_assign_cpu, "irq%d:",
+	    intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source,
+	    (mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:",
 	    vector);
-#endif
 	if (error)
 		return (error);
 	sx_xlock(&intr_table_lock);
@@ -237,6 +229,15 @@ intr_config_intr(int vector, enum intr_t
 	return (isrc->is_pic->pic_config_intr(isrc, trig, pol));
 }
 
+static void
+intr_disable_src(void *arg)
+{
+	struct intsrc *isrc;
+
+	isrc = arg;
+	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
+}
+
 #ifdef INTR_FILTER
 void
 intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
@@ -289,24 +290,6 @@ intr_event_stray(void *cookie)
 		    "too many stray irq %d's: not logging anymore\n",
 		    isrc->is_pic->pic_vector(isrc));
 }
-
-static void
-intr_eoi_src(void *arg)
-{
-	struct intsrc *isrc;
-
-	isrc = arg;
-	isrc->is_pic->pic_eoi_source(isrc);
-}
-
-static void
-intr_disab_eoi_src(void *arg)
-{
-	struct intsrc *isrc;
-
-	isrc = arg;
-	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
-}
 #else
 void
 intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)

Modified: stable/7/sys/arm/arm/intr.c
==============================================================================
--- stable/7/sys/arm/arm/intr.c	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/arm/arm/intr.c	Mon May 18 17:14:23 2009	(r192311)
@@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+typedef void (*mask_fn)(void *);
+
 static struct intr_event *intr_events[NIRQ];
 static int intrcnt_tab[NIRQ];
 static int intrcnt_index = 0;
@@ -57,27 +59,6 @@ static int last_printed = 0;
 
 void	arm_handler_execute(struct trapframe *, int);
 
-#ifdef INTR_FILTER
-static void
-intr_disab_eoi_src(void *arg)
-{
-	uintptr_t nb;
-
-	nb = (uintptr_t)arg;
-	arm_mask_irq(nb);
-}
-
-static void
-intr_eoi_src(void *arg)
-{
-	uintptr_t nb;
-
-	nb = (uintptr_t)arg;
-	arm_unmask_irq(nb);
-}
-
-#endif
-
 void
 arm_setup_irqhandler(const char *name, driver_filter_t *filt, 
     void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
@@ -89,14 +70,9 @@ arm_setup_irqhandler(const char *name, d
 		return;
 	event = intr_events[irq];
 	if (event == NULL) {
-#ifdef INTR_FILTER
-		error = intr_event_create(&event, (void *)irq, 0,
-		    (void (*)(void *))arm_unmask_irq, intr_eoi_src,
-		    intr_disab_eoi_src, NULL, "intr%d:", irq);
-#else
 		error = intr_event_create(&event, (void *)irq, 0,
-		    (void (*)(void *))arm_unmask_irq, NULL, "intr%d:", irq);
-#endif
+		    (mask_fn)arm_mask_irq, (mask_fn)arm_unmask_irq,
+		    (mask_fn)arm_unmask_irq, NULL, "intr%d:", irq);
 		if (error)
 			return;
 		intr_events[irq] = event;

Modified: stable/7/sys/i386/i386/intr_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/intr_machdep.c	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/i386/i386/intr_machdep.c	Mon May 18 17:14:23 2009	(r192311)
@@ -68,12 +68,6 @@ static struct sx intr_table_lock;
 static struct mtx intrcnt_lock;
 static STAILQ_HEAD(, pic) pics;
 
-#ifdef INTR_FILTER
-static void intr_eoi_src(void *arg);
-static void intr_disab_eoi_src(void *arg);
-static void intr_event_stray(void *cookie);
-#endif
-
 #ifdef SMP
 static int assign_cpu;
 
@@ -81,6 +75,10 @@ static void	intr_assign_next_cpu(struct 
 #endif
 
 static int	intr_assign_cpu(void *arg, u_char cpu);
+static void	intr_disable_src(void *arg);
+#ifdef INTR_FILTER
+static void	intr_event_stray(void *cookie);
+#endif
 static void	intr_init(void *__dummy);
 static int	intr_pic_registered(struct pic *pic);
 static void	intrcnt_setname(const char *name, int index);
@@ -135,16 +133,10 @@ intr_register_source(struct intsrc *isrc
 	vector = isrc->is_pic->pic_vector(isrc);
 	if (interrupt_sources[vector] != NULL)
 		return (EEXIST);
-#ifdef INTR_FILTER
-	error = intr_event_create(&isrc->is_event, isrc, 0,
-	    (mask_fn)isrc->is_pic->pic_enable_source,
-	    intr_eoi_src, intr_disab_eoi_src, intr_assign_cpu, "irq%d:",
-	    vector);
-#else
 	error = intr_event_create(&isrc->is_event, isrc, 0,
-	    (mask_fn)isrc->is_pic->pic_enable_source, intr_assign_cpu, "irq%d:",
+	    intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source,
+	    (mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:",
 	    vector);
-#endif
 	if (error)
 		return (error);
 	sx_xlock(&intr_table_lock);
@@ -228,6 +220,15 @@ intr_config_intr(int vector, enum intr_t
 	return (isrc->is_pic->pic_config_intr(isrc, trig, pol));
 }
 
+static void
+intr_disable_src(void *arg)
+{
+	struct intsrc *isrc;
+
+	isrc = arg;
+	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
+}
+
 #ifdef INTR_FILTER
 void
 intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
@@ -280,24 +281,6 @@ intr_event_stray(void *cookie)
 		    "too many stray irq %d's: not logging anymore\n",
 		    isrc->is_pic->pic_vector(isrc));
 }
-
-static void
-intr_eoi_src(void *arg)
-{
-	struct intsrc *isrc;
-
-	isrc = arg;
-	isrc->is_pic->pic_eoi_source(isrc);
-}
-
-static void
-intr_disab_eoi_src(void *arg)
-{
-	struct intsrc *isrc;
-
-	isrc = arg;
-	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
-}
 #else
 void
 intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)

Modified: stable/7/sys/ia64/ia64/interrupt.c
==============================================================================
--- stable/7/sys/ia64/ia64/interrupt.c	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/ia64/ia64/interrupt.c	Mon May 18 17:14:23 2009	(r192311)
@@ -340,10 +340,7 @@ ia64_setup_intr(const char *name, int ir
 			return (ENOMEM);
 
 		error = intr_event_create(&i->event, (void *)(uintptr_t)vector,
-		    0, ia64_intr_unmask,
-#ifdef INTR_FILTER
-		    ia64_intr_eoi, ia64_intr_mask,
-#endif
+		    0, ia64_intr_mask, ia64_intr_unmask, ia64_intr_eoi,
 		    NULL, "irq%u:", irq);
 		if (error) {
 			free(i, M_DEVBUF);

Modified: stable/7/sys/kern/kern_intr.c
==============================================================================
--- stable/7/sys/kern/kern_intr.c	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/kern/kern_intr.c	Mon May 18 17:14:23 2009	(r192311)
@@ -238,43 +238,9 @@ intr_event_update(struct intr_event *ie)
 	CTR2(KTR_INTR, "%s: updated %s", __func__, ie->ie_fullname);
 }
 
-#ifndef INTR_FILTER
-int
-intr_event_create(struct intr_event **event, void *source, int flags,
-    void (*enable)(void *), int (*assign_cpu)(void *, u_char), const char *fmt,
-    ...)
-{
-	struct intr_event *ie;
-	va_list ap;
-
-	/* The only valid flag during creation is IE_SOFT. */
-	if ((flags & ~IE_SOFT) != 0)
-		return (EINVAL);
-	ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO);
-	ie->ie_source = source;
-	ie->ie_enable = enable;
-	ie->ie_assign_cpu = assign_cpu;
-	ie->ie_flags = flags;
-	ie->ie_cpu = NOCPU;
-	TAILQ_INIT(&ie->ie_handlers);
-	mtx_init(&ie->ie_lock, "intr event", NULL, MTX_DEF);
-
-	va_start(ap, fmt);
-	vsnprintf(ie->ie_name, sizeof(ie->ie_name), fmt, ap);
-	va_end(ap);
-	strlcpy(ie->ie_fullname, ie->ie_name, sizeof(ie->ie_fullname));
-	mtx_pool_lock(mtxpool_sleep, &event_list);
-	TAILQ_INSERT_TAIL(&event_list, ie, ie_list);
-	mtx_pool_unlock(mtxpool_sleep, &event_list);
-	if (event != NULL)
-		*event = ie;
-	CTR2(KTR_INTR, "%s: created %s", __func__, ie->ie_name);
-	return (0);
-}
-#else
 int
-intr_event_create(struct intr_event **event, void *source, int flags,
-    void (*enable)(void *), void (*eoi)(void *), void (*disab)(void *), 
+intr_event_create(struct intr_event **event, void *source,int flags,
+    void (*disable)(void *), void (*enable)(void *), void (*eoi)(void *),
     int (*assign_cpu)(void *, u_char), const char *fmt, ...)
 {
 	struct intr_event *ie;
@@ -285,10 +251,10 @@ intr_event_create(struct intr_event **ev
 		return (EINVAL);
 	ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO);
 	ie->ie_source = source;
+	ie->ie_disable = disable;
 	ie->ie_enable = enable;
-	ie->ie_assign_cpu = assign_cpu;
 	ie->ie_eoi = eoi;
-	ie->ie_disab = disab;
+	ie->ie_assign_cpu = assign_cpu;
 	ie->ie_flags = flags;
 	ie->ie_cpu = NOCPU;
 	TAILQ_INIT(&ie->ie_handlers);
@@ -306,7 +272,6 @@ intr_event_create(struct intr_event **ev
 	CTR2(KTR_INTR, "%s: created %s", __func__, ie->ie_name);
 	return (0);
 }
-#endif
 
 /*
  * Bind an interrupt event to the specified CPU.  Note that not all
@@ -945,13 +910,8 @@ swi_add(struct intr_event **eventp, cons
 		if (!(ie->ie_flags & IE_SOFT))
 			return (EINVAL);
 	} else {
-#ifdef INTR_FILTER
 		error = intr_event_create(&ie, NULL, IE_SOFT,
 		    NULL, NULL, NULL, NULL, "swi%d:", pri);
-#else
-		error = intr_event_create(&ie, NULL, IE_SOFT,
-		    NULL, NULL, "swi%d:", pri);
-#endif
 		if (error)
 			return (error);
 		if (eventp != NULL)
@@ -1408,8 +1368,8 @@ intr_event_handle(struct intr_event *ie,
 		if (ie->ie_eoi != NULL)
 			ie->ie_eoi(ie->ie_source);
 	} else {
-		if (ie->ie_disab != NULL)
-			ie->ie_disab(ie->ie_source);
+		if (ie->ie_disable != NULL)
+			ie->ie_disable(ie->ie_source);
 	}
 	critical_exit();
 	

Modified: stable/7/sys/powerpc/powerpc/intr_machdep.c
==============================================================================
--- stable/7/sys/powerpc/powerpc/intr_machdep.c	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/powerpc/powerpc/intr_machdep.c	Mon May 18 17:14:23 2009	(r192311)
@@ -105,7 +105,6 @@ intrcnt_setname(const char *name, int in
 	    MAXCOMLEN, name);
 }
 
-#ifdef INTR_FILTER
 static void
 powerpc_intr_eoi(void *arg)
 {
@@ -121,7 +120,6 @@ powerpc_intr_mask(void *arg)
 
 	PIC_MASK(pic, irq);
 }
-#endif
 
 static void
 powerpc_intr_unmask(void *arg)
@@ -187,10 +185,7 @@ powerpc_setup_intr(const char *name, u_i
 			return (ENOMEM);
 		}
 		error = intr_event_create(&i->event, (void *)irq, 0,
-		    powerpc_intr_unmask,
-#ifdef INTR_FILTER
-		    powerpc_intr_eoi, powerpc_intr_mask,
-#endif
+		    powerpc_intr_mask, powerpc_intr_unmask, powerpc_intr_eoi,
 		    NULL, "irq%u:", irq);
 		if (error) {
 			/* XXX unlock */

Modified: stable/7/sys/sparc64/sparc64/intr_machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/intr_machdep.c	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/sparc64/sparc64/intr_machdep.c	Mon May 18 17:14:23 2009	(r192311)
@@ -345,12 +345,8 @@ intr_controller_register(int vec, const 
 	sx_xunlock(&intr_table_lock);
 	if (ie != NULL)
 		return (EEXIST);
-	error = intr_event_create(&ie, iv, 0, ic->ic_clear,
-#ifdef INTR_FILTER
-	    ic->ic_clear, NULL, intr_assign_cpu, "vec%d:", vec);
-#else
-	    intr_assign_cpu, "vec%d:", vec);
-#endif
+	error = intr_event_create(&ie, iv, 0, NULL, ic->ic_clear,
+	    ic->ic_clear, intr_assign_cpu, "vec%d:", vec);
 	if (error != 0)
 		return (error);
 	sx_xlock(&intr_table_lock);

Modified: stable/7/sys/sys/interrupt.h
==============================================================================
--- stable/7/sys/sys/interrupt.h	Mon May 18 17:10:26 2009	(r192310)
+++ stable/7/sys/sys/interrupt.h	Mon May 18 17:14:23 2009	(r192311)
@@ -72,12 +72,10 @@ struct intr_event {
 	struct mtx	ie_lock;
 	void		*ie_source;	/* Cookie used by MD code. */
 	struct intr_thread *ie_thread;	/* Thread we are connected to. */
+	void		(*ie_disable)(void *);
 	void		(*ie_enable)(void *);
-	int		(*ie_assign_cpu)(void *, u_char);
-#ifdef INTR_FILTER
 	void		(*ie_eoi)(void *);
-	void		(*ie_disab)(void *);
-#endif
+	int		(*ie_assign_cpu)(void *, u_char);
 	int		ie_flags;
 	int		ie_count;	/* Loop counter. */
 	int		ie_warncnt;	/* Rate-check interrupt storm warns. */
@@ -130,18 +128,11 @@ int	intr_event_add_handler(struct intr_e
 	    driver_filter_t filter, driver_intr_t handler, void *arg, 
 	    u_char pri, enum intr_type flags, void **cookiep);	    
 int	intr_event_bind(struct intr_event *ie, u_char cpu);
-#ifndef INTR_FILTER
-int	intr_event_create(struct intr_event **event, void *source,
-	    int flags, void (*enable)(void *),
-	    int (*assign_cpu)(void *, u_char), const char *fmt, ...)
-	    __printflike(6, 7);
-#else
 int	intr_event_create(struct intr_event **event, void *source,
-	    int flags, void (*enable)(void *), void (*eoi)(void *), 
-	    void (*disab)(void *), int (*assign_cpu)(void *, u_char),
+	    int flags, void (*disable)(void *), void (*enable)(void *),
+	    void (*eoi)(void *), int (*assign_cpu)(void *, u_char),
 	    const char *fmt, ...)
 	    __printflike(8, 9);
-#endif
 int	intr_event_destroy(struct intr_event *ie);
 int	intr_event_remove_handler(void *cookie);
 #ifndef INTR_FILTER
From jhb at FreeBSD.org  Mon May 18 17:39:13 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Mon May 18 17:39:30 2009
Subject: svn commit: r192316 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb sys
Message-ID: <200905181739.n4IHdCui069699@svn.freebsd.org>

Author: jhb
Date: Mon May 18 17:39:12 2009
New Revision: 192316
URL: http://svn.freebsd.org/changeset/base/192316

Log:
  MFC: Use __null for NULL for GNU C++ 4.x and use the same value for NULL
  in the kernel as in userland.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/sys/_null.h

Modified: stable/7/sys/sys/_null.h
==============================================================================
--- stable/7/sys/sys/_null.h	Mon May 18 17:37:27 2009	(r192315)
+++ stable/7/sys/sys/_null.h	Mon May 18 17:39:12 2009	(r192316)
@@ -28,14 +28,18 @@
 
 #ifndef NULL
 
-#if defined(_KERNEL) || !defined(__cplusplus)
+#if !defined(__cplusplus)
 #define	NULL	((void *)0)
 #else
+#if defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4
+#define	NULL	__null
+#else
 #if defined(__LP64__)
 #define	NULL	(0L)
 #else
 #define	NULL	0
 #endif	/* __LP64__ */
-#endif	/* _KERNEL || !__cplusplus */
+#endif	/* __GNUG__ */
+#endif	/* !__cplusplus */
 
 #endif
From jhb at FreeBSD.org  Mon May 18 20:23:17 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Mon May 18 20:23:23 2009
Subject: svn commit: r192336 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netinet
Message-ID: <200905182023.n4IKNGZ2073804@svn.freebsd.org>

Author: jhb
Date: Mon May 18 20:23:16 2009
New Revision: 192336
URL: http://svn.freebsd.org/changeset/base/192336

Log:
  MFC: Convert IPFW_DEFAULT_TO_ACCEPT into a loader tunable.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/ip_fw2.c

Modified: stable/7/sys/netinet/ip_fw2.c
==============================================================================
--- stable/7/sys/netinet/ip_fw2.c	Mon May 18 19:56:06 2009	(r192335)
+++ stable/7/sys/netinet/ip_fw2.c	Mon May 18 20:23:16 2009	(r192336)
@@ -111,6 +111,11 @@ static int fw_verbose;
 static struct callout ipfw_timeout;
 static int verbose_limit;
 
+#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
+static int default_to_accept = 1;
+#else
+static int default_to_accept;
+#endif
 static uma_zone_t ipfw_dyn_rule_zone;
 
 /*
@@ -170,6 +175,9 @@ SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, d
     NULL, IPFW_DEFAULT_RULE, "The default/max possible rule number.");
 SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, tables_max, CTLFLAG_RD,
     NULL, IPFW_TABLES_MAX, "The maximum number of tables.");
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, default_to_accept, CTLFLAG_RDTUN,
+    &default_to_accept, 0, "Make the default rule accept all packets.");
+TUNABLE_INT("net.inet.ip.fw.default_to_accept", &default_to_accept);
 #endif /* SYSCTL_NODE */
 
 /*
@@ -4514,11 +4522,7 @@ ipfw_init(void)
 	default_rule.set = RESVD_SET;
 
 	default_rule.cmd[0].len = 1;
-	default_rule.cmd[0].opcode =
-#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-				1 ? O_ACCEPT :
-#endif
-				O_DENY;
+	default_rule.cmd[0].opcode = default_to_accept ? O_ACCEPT : O_DENY;
 
 	error = add_rule(&layer3_chain, &default_rule);
 	if (error != 0) {
From jhb at FreeBSD.org  Mon May 18 21:44:34 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Mon May 18 21:44:51 2009
Subject: svn commit: r192340 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb net
Message-ID: <200905182144.n4ILiXeh075592@svn.freebsd.org>

Author: jhb
Date: Mon May 18 21:44:33 2009
New Revision: 192340
URL: http://svn.freebsd.org/changeset/base/192340

Log:
  MFC: Remove dependency of vlan.ko on miibus.ko.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/net/if_vlan.c

Modified: stable/7/sys/net/if_vlan.c
==============================================================================
--- stable/7/sys/net/if_vlan.c	Mon May 18 21:36:17 2009	(r192339)
+++ stable/7/sys/net/if_vlan.c	Mon May 18 21:44:33 2009	(r192340)
@@ -567,7 +567,6 @@ static moduledata_t vlan_mod = {
 
 DECLARE_MODULE(if_vlan, vlan_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
 MODULE_VERSION(if_vlan, 3);
-MODULE_DEPEND(if_vlan, miibus, 1, 1, 1);
 
 static struct ifnet *
 vlan_clone_match_ethertag(struct if_clone *ifc, const char *name, int *tag)
From marcel at FreeBSD.org  Mon May 18 22:45:10 2009
From: marcel at FreeBSD.org (Marcel Moolenaar)
Date: Mon May 18 22:45:26 2009
Subject: svn commit: r192352 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/uart
Message-ID: <200905182245.n4IMj9WM077354@svn.freebsd.org>

Author: marcel
Date: Mon May 18 22:45:09 2009
New Revision: 192352
URL: http://svn.freebsd.org/changeset/base/192352

Log:
  MFC r190834:
  Fix hangs caused by hardware that signals receive errors
  (framing, parity, etc), but does not indicate characters
  being received. Since no chracters have been received,
  ignore the line errors.
  
  PR:		131006

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/uart/uart_dev_ns8250.c

Modified: stable/7/sys/dev/uart/uart_dev_ns8250.c
==============================================================================
--- stable/7/sys/dev/uart/uart_dev_ns8250.c	Mon May 18 22:34:44 2009	(r192351)
+++ stable/7/sys/dev/uart/uart_dev_ns8250.c	Mon May 18 22:45:09 2009	(r192352)
@@ -50,14 +50,16 @@ __FBSDID("$FreeBSD$");
 static void
 ns8250_clrint(struct uart_bas *bas)
 {
-	uint8_t iir;
+	uint8_t iir, lsr;
 
 	iir = uart_getreg(bas, REG_IIR);
 	while ((iir & IIR_NOPEND) == 0) {
 		iir &= IIR_IMASK;
-		if (iir == IIR_RLS)
-			(void)uart_getreg(bas, REG_LSR);
-		else if (iir == IIR_RXRDY || iir == IIR_RXTOUT)
+		if (iir == IIR_RLS) {
+			lsr = uart_getreg(bas, REG_LSR);
+			if (lsr & (LSR_BI|LSR_FE|LSR_PE))
+				(void)uart_getreg(bas, REG_DATA);
+		} else if (iir == IIR_RXRDY || iir == IIR_RXTOUT)
 			(void)uart_getreg(bas, REG_DATA);
 		else if (iir == IIR_MLSC)
 			(void)uart_getreg(bas, REG_MSR);
@@ -563,7 +565,6 @@ ns8250_bus_ipend(struct uart_softc *sc)
 	ipend = 0;
 	if (iir & IIR_RXRDY) {
 		lsr = uart_getreg(bas, REG_LSR);
-		uart_unlock(sc->sc_hwmtx);
 		if (lsr & LSR_OE)
 			ipend |= SER_INT_OVERRUN;
 		if (lsr & LSR_BI)
@@ -571,12 +572,14 @@ ns8250_bus_ipend(struct uart_softc *sc)
 		if (lsr & LSR_RXRDY)
 			ipend |= SER_INT_RXREADY;
 	} else {
-		uart_unlock(sc->sc_hwmtx);
 		if (iir & IIR_TXRDY)
 			ipend |= SER_INT_TXIDLE;
 		else
 			ipend |= SER_INT_SIGCHG;
 	}
+	if (ipend == 0)
+		ns8250_clrint(bas);
+	uart_unlock(sc->sc_hwmtx);
 	return ((sc->sc_leaving) ? 0 : ipend);
 }
 
From jhb at FreeBSD.org  Tue May 19 14:01:58 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 19 14:02:15 2009
Subject: svn commit: r192378 - in stable/7: sys sys/contrib/pf
	sys/dev/ath/ath_hal sys/dev/cxgb sys/dev/pci usr.sbin/pciconf
Message-ID: <200905191401.n4JE1vtR099601@svn.freebsd.org>

Author: jhb
Date: Tue May 19 14:01:57 2009
New Revision: 192378
URL: http://svn.freebsd.org/changeset/base/192378

Log:
  MFC: Add more PCI-express capability registers and display additional
  details about PCI-express devices.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/pci/pcireg.h
  stable/7/usr.sbin/pciconf/   (props changed)
  stable/7/usr.sbin/pciconf/cap.c

Modified: stable/7/sys/dev/pci/pcireg.h
==============================================================================
--- stable/7/sys/dev/pci/pcireg.h	Tue May 19 12:42:01 2009	(r192377)
+++ stable/7/sys/dev/pci/pcireg.h	Tue May 19 14:01:57 2009	(r192378)
@@ -594,8 +594,36 @@
 #define	PCIM_EXP_TYPE_UPSTREAM_PORT	0x0050
 #define	PCIM_EXP_TYPE_DOWNSTREAM_PORT	0x0060
 #define	PCIM_EXP_TYPE_PCI_BRIDGE	0x0070
+#define	PCIM_EXP_TYPE_PCIE_BRIDGE	0x0080
+#define	PCIM_EXP_TYPE_ROOT_INT_EP	0x0090
+#define	PCIM_EXP_TYPE_ROOT_EC		0x00a0
 #define	PCIM_EXP_FLAGS_SLOT		0x0100
 #define	PCIM_EXP_FLAGS_IRQ		0x3e00
+#define	PCIR_EXPRESS_DEVICE_CAP	0x4
+#define	PCIM_EXP_CAP_MAX_PAYLOAD	0x0007
+#define	PCIR_EXPRESS_DEVICE_CTL	0x8
+#define	PCIM_EXP_CTL_MAX_PAYLOAD	0x00e0
+#define	PCIM_EXP_CTL_MAX_READ_REQUEST	0x7000
+#define	PCIR_EXPRESS_DEVICE_STA	0xa
+#define	PCIR_EXPRESS_LINK_CAP	0xc
+#define	PCIM_LINK_CAP_MAX_SPEED		0x0000000f
+#define	PCIM_LINK_CAP_MAX_WIDTH		0x000003f0
+#define	PCIM_LINK_CAP_ASPM		0x00000c00
+#define	PCIM_LINK_CAP_L0S_EXIT		0x00007000
+#define	PCIM_LINK_CAP_L1_EXIT		0x00038000
+#define	PCIM_LINK_CAP_PORT		0xff000000
+#define	PCIR_EXPRESS_LINK_CTL	0x10
+#define	PCIR_EXPRESS_LINK_STA	0x12
+#define	PCIM_LINK_STA_SPEED		0x000f
+#define	PCIM_LINK_STA_WIDTH		0x03f0
+#define	PCIM_LINK_STA_TRAINING_ERROR	0x0400
+#define	PCIM_LINK_STA_TRAINING		0x0800
+#define	PCIM_LINK_STA_SLOT_CLOCK	0x1000
+#define	PCIR_EXPRESS_SLOT_CAP	0x14
+#define	PCIR_EXPRESS_SLOT_CTL	0x18
+#define	PCIR_EXPRESS_SLOT_STA	0x1a
+#define	PCIR_EXPRESS_ROOT_CTL	0x1c
+#define	PCIR_EXPRESS_ROOT_STA	0x20
 
 /* MSI-X definitions */
 #define	PCIR_MSIX_CTRL		0x2

Modified: stable/7/usr.sbin/pciconf/cap.c
==============================================================================
--- stable/7/usr.sbin/pciconf/cap.c	Tue May 19 12:42:01 2009	(r192377)
+++ stable/7/usr.sbin/pciconf/cap.c	Tue May 19 14:01:57 2009	(r192378)
@@ -151,7 +151,9 @@ cap_pcix(int fd, struct pci_conf *p, uin
 		printf("64-bit ");
 	if ((p->pc_hdr & PCIM_HDRTYPE) == 1)
 		printf("bridge ");
-	printf("supports");
+	if ((p->pc_hdr & PCIM_HDRTYPE) != 1 || (status & (PCIXM_STATUS_133CAP |
+	    PCIXM_STATUS_266CAP | PCIXM_STATUS_533CAP)) != 0)
+		printf("supports");
 	comma = 0;
 	if (status & PCIXM_STATUS_133CAP) {
 		printf("%s 133MHz", comma ? "," : "");
@@ -357,9 +359,12 @@ cap_subvendor(int fd, struct pci_conf *p
 	printf("PCI Bridge card=0x%08x", id);
 }
 
+#define	MAX_PAYLOAD(field)		(128 << (field))
+
 static void
 cap_express(int fd, struct pci_conf *p, uint8_t ptr)
 {
+	uint32_t val;
 	uint16_t flags;
 
 	flags = read_config(fd, &p->pc_sel, ptr + PCIR_EXPRESS_FLAGS, 2);
@@ -383,12 +388,30 @@ cap_express(int fd, struct pci_conf *p, 
 	case PCIM_EXP_TYPE_PCI_BRIDGE:
 		printf("PCI bridge");
 		break;
+	case PCIM_EXP_TYPE_PCIE_BRIDGE:
+		printf("PCI to PCIe bridge");
+		break;
+	case PCIM_EXP_TYPE_ROOT_INT_EP:
+		printf("root endpoint");
+		break;
+	case PCIM_EXP_TYPE_ROOT_EC:
+		printf("event collector");
+		break;
 	default:
-		printf("type %d", (flags & PCIM_EXP_FLAGS_TYPE) >> 8);
+		printf("type %d", (flags & PCIM_EXP_FLAGS_TYPE) >> 4);
 		break;
 	}
 	if (flags & PCIM_EXP_FLAGS_IRQ)
-		printf(" IRQ %d", (flags & PCIM_EXP_FLAGS_IRQ) >> 17);
+		printf(" IRQ %d", (flags & PCIM_EXP_FLAGS_IRQ) >> 8);
+	val = read_config(fd, &p->pc_sel, ptr + PCIR_EXPRESS_DEVICE_CAP, 4);
+	flags = read_config(fd, &p->pc_sel, ptr + PCIR_EXPRESS_DEVICE_CTL, 2);
+	printf(" max data %d(%d)",
+	    MAX_PAYLOAD((flags & PCIM_EXP_CTL_MAX_PAYLOAD) >> 5),
+	    MAX_PAYLOAD(val & PCIM_EXP_CAP_MAX_PAYLOAD));
+	val = read_config(fd, &p->pc_sel, ptr + PCIR_EXPRESS_LINK_CAP, 4);
+	flags = read_config(fd, &p->pc_sel, ptr+ PCIR_EXPRESS_LINK_STA, 2);
+	printf(" link x%d(x%d)", (flags & PCIM_LINK_STA_WIDTH) >> 4,
+	    (val & PCIM_LINK_CAP_MAX_WIDTH) >> 4);
 }
 
 static void
From jhb at FreeBSD.org  Tue May 19 15:33:42 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 19 15:33:48 2009
Subject: svn commit: r192386 - in stable/7: sys sys/contrib/pf
	sys/dev/ath/ath_hal sys/dev/cxgb sys/dev/pci usr.sbin/pciconf
Message-ID: <200905191533.n4JFXf2e001935@svn.freebsd.org>

Author: jhb
Date: Tue May 19 15:33:41 2009
New Revision: 192386
URL: http://svn.freebsd.org/changeset/base/192386

Log:
  MFC: Add SATA and PCI Advanced Features capabilities reporting.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/pci/pcireg.h
  stable/7/usr.sbin/pciconf/   (props changed)
  stable/7/usr.sbin/pciconf/cap.c

Modified: stable/7/sys/dev/pci/pcireg.h
==============================================================================
--- stable/7/sys/dev/pci/pcireg.h	Tue May 19 14:51:48 2009	(r192385)
+++ stable/7/sys/dev/pci/pcireg.h	Tue May 19 15:33:41 2009	(r192386)
@@ -113,6 +113,8 @@
 #define	PCIY_SECDEV	0x0f	/* Secure Device */
 #define	PCIY_EXPRESS	0x10	/* PCI Express */
 #define	PCIY_MSIX	0x11	/* MSI-X */
+#define	PCIY_SATA	0x12	/* SATA */
+#define	PCIY_PCIAF	0x13	/* PCI Advanced Features */
 
 /* config registers for header type 0 devices */
 
@@ -640,3 +642,12 @@
 #define	PCIM_MSIX_BIR_BAR_20		4
 #define	PCIM_MSIX_BIR_BAR_24		5
 #define	PCIM_MSIX_VCTRL_MASK		0x1
+
+/* PCI Advanced Features definitions */
+#define	PCIR_PCIAF_CAP		0x3
+#define	PCIM_PCIAFCAP_TP	0x01
+#define	PCIM_PCIAFCAP_FLR	0x02
+#define	PCIR_PCIAF_CTRL		0x4
+#define	PCIR_PCIAFCTRL_FLR	0x01
+#define	PCIR_PCIAF_STATUS	0x5
+#define	PCIR_PCIAFSTATUS_TP	0x01

Modified: stable/7/usr.sbin/pciconf/cap.c
==============================================================================
--- stable/7/usr.sbin/pciconf/cap.c	Tue May 19 14:51:48 2009	(r192385)
+++ stable/7/usr.sbin/pciconf/cap.c	Tue May 19 15:33:41 2009	(r192386)
@@ -437,6 +437,24 @@ cap_msix(int fd, struct pci_conf *p, uin
 		printf(" enabled");
 }
 
+static void
+cap_sata(int fd, struct pci_conf *p, uint8_t ptr)
+{
+
+	printf("SATA Index-Data Pair");
+}
+
+static void
+cap_pciaf(int fd, struct pci_conf *p, uint8_t ptr)
+{
+	uint8_t cap;
+
+	cap = read_config(fd, &p->pc_sel, ptr + PCIR_PCIAF_CAP, 1);
+	printf("PCI Advanced Features:%s%s",
+	    cap & PCIM_PCIAFCAP_FLR ? " FLR" : "",
+	    cap & PCIM_PCIAFCAP_TP  ? " TP"  : "");
+}
+
 void
 list_caps(int fd, struct pci_conf *p)
 {
@@ -499,6 +517,12 @@ list_caps(int fd, struct pci_conf *p)
 		case PCIY_MSIX:
 			cap_msix(fd, p, ptr);
 			break;
+		case PCIY_SATA:
+			cap_sata(fd, p, ptr);
+			break;
+		case PCIY_PCIAF:
+			cap_pciaf(fd, p, ptr);
+			break;
 		default:
 			printf("unknown");
 			break;
From jhb at FreeBSD.org  Tue May 19 15:47:43 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 19 15:47:49 2009
Subject: svn commit: r192387 - in stable/7/sys: . contrib/pf dev/ata
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905191547.n4JFlgcT002274@svn.freebsd.org>

Author: jhb
Date: Tue May 19 15:47:42 2009
New Revision: 192387
URL: http://svn.freebsd.org/changeset/base/192387

Log:
  MFC:
  - Add a void pointer to the ata-pci controller softc to allow
    chipset-specific code to attach chipset-specific data.
  - Use chipset-specific data in the acard and promise chipsets rather than
    changing the ivars of ATA PCI devices.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ata/ata-chipset.c
  stable/7/sys/dev/ata/ata-pci.h
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/ata/ata-chipset.c
==============================================================================
--- stable/7/sys/dev/ata/ata-chipset.c	Tue May 19 15:33:41 2009	(r192386)
+++ stable/7/sys/dev/ata/ata-chipset.c	Tue May 19 15:47:42 2009	(r192387)
@@ -50,6 +50,12 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+struct ata_serialize {
+    struct mtx  locked_mtx;
+    int         locked_ch;
+    int         restart_ch;
+};
+
 /* local prototypes */
 /* ata-chipset.c */
 static int ata_generic_chipinit(device_t dev);
@@ -186,6 +192,7 @@ static struct ata_chip_id *ata_match_chi
 static struct ata_chip_id *ata_find_chip(device_t dev, struct ata_chip_id *index, int slot);
 static int ata_setup_interrupt(device_t dev);
 static int ata_serialize(device_t dev, int flags);
+static void ata_serialize_init(struct ata_serialize *serial);
 static void ata_print_cable(device_t dev, u_int8_t *who);
 static int ata_atapi(device_t dev);
 static int ata_check_80pin(device_t dev, int mode);
@@ -919,6 +926,7 @@ static int
 ata_acard_chipinit(device_t dev)
 {
     struct ata_pci_controller *ctlr = device_get_softc(dev);
+    struct ata_serialize *serial;
 
     if (ata_setup_interrupt(dev))
 	return ENXIO;
@@ -927,6 +935,10 @@ ata_acard_chipinit(device_t dev)
     if (ctlr->chip->cfg1 == ATPOLD) {
 	ctlr->setmode = ata_acard_850_setmode;
 	ctlr->locking = ata_serialize;
+	serial = malloc(sizeof(struct ata_serialize),
+			      M_TEMP, M_WAITOK | M_ZERO);
+	ata_serialize_init(serial);
+	ctlr->chipset_data = serial;
     }
     else
 	ctlr->setmode = ata_acard_86X_setmode;
@@ -3461,7 +3473,7 @@ ata_promise_chipinit(device_t dev)
 	    mtx_init(&hpkt->mtx, "ATA promise HPKT lock", NULL, MTX_DEF);
 	    TAILQ_INIT(&hpkt->queue);
 	    hpkt->busy = 0;
-	    device_set_ivars(dev, hpkt);
+	    ctlr->chipset_data = hpkt;
 	    ctlr->allocate = ata_promise_mio_allocate;
 	    ctlr->reset = ata_promise_mio_reset;
 	    ctlr->dmainit = ata_promise_mio_dmainit;
@@ -3908,7 +3920,7 @@ ata_promise_mio_reset(device_t dev)
     case PRSX4X:
 
 	/* softreset channel ATA module */
-	hpktp = device_get_ivars(ctlr->dev);
+	hpktp = ctlr->chipset_data;
 	ATA_OUTL(ctlr->r_res2, 0xc0260 + (ch->unit << 7), ch->unit + 1);
 	ata_udelay(1000);
 	ATA_OUTL(ctlr->r_res2, 0xc0260 + (ch->unit << 7),
@@ -4247,7 +4259,7 @@ ata_promise_apkt(u_int8_t *bytep, struct
 static void
 ata_promise_queue_hpkt(struct ata_pci_controller *ctlr, u_int32_t hpkt)
 {
-    struct ata_promise_sx4 *hpktp = device_get_ivars(ctlr->dev);
+    struct ata_promise_sx4 *hpktp = ctlr->chipset_data;
 
     mtx_lock(&hpktp->mtx);
     if (hpktp->busy) {
@@ -4266,7 +4278,7 @@ ata_promise_queue_hpkt(struct ata_pci_co
 static void
 ata_promise_next_hpkt(struct ata_pci_controller *ctlr)
 {
-    struct ata_promise_sx4 *hpktp = device_get_ivars(ctlr->dev);
+    struct ata_promise_sx4 *hpktp = ctlr->chipset_data;
     struct host_packet *hp;
 
     mtx_lock(&hpktp->mtx);
@@ -5841,11 +5853,14 @@ ata_setup_interrupt(device_t dev)
     return 0;
 }
 
-struct ata_serialize {
-    struct mtx  locked_mtx;
-    int         locked_ch;
-    int         restart_ch;
-};
+static void
+ata_serialize_init(struct ata_serialize *serial)
+{
+
+    mtx_init(&serial->locked_mtx, "ATA serialize lock", NULL, MTX_DEF); 
+    serial->locked_ch = -1;
+    serial->restart_ch = -1;
+}
 
 static int
 ata_serialize(device_t dev, int flags)
@@ -5853,20 +5868,9 @@ ata_serialize(device_t dev, int flags)
     struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev));
     struct ata_channel *ch = device_get_softc(dev);
     struct ata_serialize *serial;
-    static int inited = 0;
     int res;
 
-    if (!inited) {
-	serial = malloc(sizeof(struct ata_serialize),
-			      M_TEMP, M_NOWAIT | M_ZERO);
-	mtx_init(&serial->locked_mtx, "ATA serialize lock", NULL, MTX_DEF); 
-	serial->locked_ch = -1;
-	serial->restart_ch = -1;
-	device_set_ivars(ctlr->dev, serial);
-	inited = 1;
-    }
-    else
-	serial = device_get_ivars(ctlr->dev);
+    serial = ctlr->chipset_data;
 
     mtx_lock(&serial->locked_mtx);
     switch (flags) {

Modified: stable/7/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/7/sys/dev/ata/ata-pci.h	Tue May 19 15:33:41 2009	(r192386)
+++ stable/7/sys/dev/ata/ata-pci.h	Tue May 19 15:47:42 2009	(r192387)
@@ -59,6 +59,7 @@ struct ata_pci_controller {
     void                (*function)(void *);
     void                *argument;
     } interrupt[8];     /* XXX SOS max ch# for now */
+    void                *chipset_data;
 };
 
 /* structure for SATA connection update hotplug/hotswap support */
From scottl at FreeBSD.org  Tue May 19 18:14:06 2009
From: scottl at FreeBSD.org (Scott Long)
Date: Tue May 19 18:14:23 2009
Subject: svn commit: r192402 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/ciss dev/cxgb
Message-ID: <200905191814.n4JIE5LO006057@svn.freebsd.org>

Author: scottl
Date: Tue May 19 18:14:04 2009
New Revision: 192402
URL: http://svn.freebsd.org/changeset/base/192402

Log:
  Merge PCI ID additions from vendor

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/ciss/ciss.c
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/ciss/ciss.c
==============================================================================
--- stable/7/sys/dev/ciss/ciss.c	Tue May 19 17:54:32 2009	(r192401)
+++ stable/7/sys/dev/ciss/ciss.c	Tue May 19 18:14:04 2009	(r192402)
@@ -292,17 +292,20 @@ static struct
     { 0x103C, 0x3234, CISS_BOARD_SA5,	"HP Smart Array P400" },
     { 0x103C, 0x3235, CISS_BOARD_SA5,	"HP Smart Array P400i" },
     { 0x103C, 0x3236, CISS_BOARD_SA5,	"HP Smart Array" },
-    { 0x103C, 0x3237, CISS_BOARD_SA5,	"HP Smart Array" },
+    { 0x103C, 0x3237, CISS_BOARD_SA5,	"HP Smart Array E500" },
     { 0x103C, 0x3238, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x3239, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x323A, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x323B, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x323C, CISS_BOARD_SA5,	"HP Smart Array" },
+    { 0x103C, 0x323D, CISS_BOARD_SA5,	"HP Smart Array P700m" },
     { 0x103C, 0x3241, CISS_BOARD_SA5,	"HP Smart Array P212" },
     { 0x103C, 0x3243, CISS_BOARD_SA5,	"HP Smart Array P410" },
     { 0x103C, 0x3245, CISS_BOARD_SA5,	"HP Smart Array P410i" },
     { 0x103C, 0x3247, CISS_BOARD_SA5,	"HP Smart Array P411" },
     { 0x103C, 0x3249, CISS_BOARD_SA5,	"HP Smart Array P812" },
+    { 0x103C, 0x324A, CISS_BOARD_SA5,	"HP Smart Array P712m" },
+    { 0x103C, 0x324B, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0, 0, 0, NULL }
 };
 
From jhb at FreeBSD.org  Tue May 19 19:45:38 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 19 19:45:54 2009
Subject: svn commit: r192406 - in stable/7/sys: . amd64/amd64 arm/arm
	contrib/pf dev/ath/ath_hal dev/cxgb i386/i386 ia64/ia64 kern
	powerpc/powerpc sparc64/sparc64 sun4v/sun4v sys
Message-ID: <200905191945.n4JJjb0Q008111@svn.freebsd.org>

Author: jhb
Date: Tue May 19 19:45:36 2009
New Revision: 192406
URL: http://svn.freebsd.org/changeset/base/192406

Log:
  MFC: Add a MI intr_event_handle() routine for the non-INTR_FILTER case.
  This allows all the INTR_FILTER #ifdef's to be removed from the MD
  interrupt code.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/intr_machdep.c
  stable/7/sys/arm/arm/intr.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/i386/intr_machdep.c
  stable/7/sys/ia64/ia64/interrupt.c
  stable/7/sys/kern/kern_intr.c
  stable/7/sys/powerpc/powerpc/intr_machdep.c
  stable/7/sys/sparc64/sparc64/intr_machdep.c
  stable/7/sys/sun4v/sun4v/intr_machdep.c
  stable/7/sys/sys/interrupt.h

Modified: stable/7/sys/amd64/amd64/intr_machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/intr_machdep.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/amd64/amd64/intr_machdep.c	Tue May 19 19:45:36 2009	(r192406)
@@ -85,9 +85,6 @@ static void	intr_assign_next_cpu(struct 
 
 static int	intr_assign_cpu(void *arg, u_char cpu);
 static void	intr_disable_src(void *arg);
-#ifdef INTR_FILTER
-static void	intr_event_stray(void *cookie);
-#endif
 static void	intr_init(void *__dummy);
 static int	intr_pic_registered(struct pic *pic);
 static void	intrcnt_setname(const char *name, int index);
@@ -238,66 +235,12 @@ intr_disable_src(void *arg)
 	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
 }
 
-#ifdef INTR_FILTER
 void
 intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
 {
-	struct thread *td;
 	struct intr_event *ie;
-	int vector;
-
-	td = curthread;
-
-	/*
-	 * We count software interrupts when we process them.  The
-	 * code here follows previous practice, but there's an
-	 * argument for counting hardware interrupts when they're
-	 * processed too.
-	 */
-	(*isrc->is_count)++;
-	PCPU_INC(cnt.v_intr);
-
-	ie = isrc->is_event;
-
-	/*
-	 * XXX: We assume that IRQ 0 is only used for the ISA timer
-	 * device (clk).
-	 */
-	vector = isrc->is_pic->pic_vector(isrc);
-	if (vector == 0)
-		clkintr_pending = 1;
-
-	if (intr_event_handle(ie, frame) != 0)
-		intr_event_stray(isrc);
-}
-
-static void
-intr_event_stray(void *cookie)
-{
-	struct intsrc *isrc;
-
-	isrc = cookie;
-	/*
-	 * For stray interrupts, mask and EOI the source, bump the
-	 * stray count, and log the condition.
-	 */
-	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
-	(*isrc->is_straycount)++;
-	if (*isrc->is_straycount < MAX_STRAY_LOG)
-		log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc));
-	else if (*isrc->is_straycount == MAX_STRAY_LOG)
-		log(LOG_CRIT,
-		    "too many stray irq %d's: not logging anymore\n",
-		    isrc->is_pic->pic_vector(isrc));
-}
-#else
-void
-intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
-{
 	struct thread *td;
-	struct intr_event *ie;
-	struct intr_handler *ih;
-	int error, vector, thread, ret;
+	int vector;
 
 	td = curthread;
 
@@ -324,7 +267,7 @@ intr_execute_handlers(struct intsrc *isr
 	 * For stray interrupts, mask and EOI the source, bump the
 	 * stray count, and log the condition.
 	 */
-	if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) {
+	if (intr_event_handle(ie, frame) != 0) {
 		isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
 		(*isrc->is_straycount)++;
 		if (*isrc->is_straycount < MAX_STRAY_LOG)
@@ -333,60 +276,8 @@ intr_execute_handlers(struct intsrc *isr
 			log(LOG_CRIT,
 			    "too many stray irq %d's: not logging anymore\n",
 			    vector);
-		return;
 	}
-
-	/*
-	 * Execute fast interrupt handlers directly.
-	 * To support clock handlers, if a handler registers
-	 * with a NULL argument, then we pass it a pointer to
-	 * a trapframe as its argument.
-	 */
-	td->td_intr_nesting_level++;
-	ret = 0;
-	thread = 0;
-	critical_enter();
-	TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
-		if (ih->ih_filter == NULL) {
-			thread = 1;
-			continue;
-		}
-		CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
-		    ih->ih_filter, ih->ih_argument == NULL ? frame :
-		    ih->ih_argument, ih->ih_name);
-		if (ih->ih_argument == NULL)
-			ret = ih->ih_filter(frame);
-		else
-			ret = ih->ih_filter(ih->ih_argument);
-		/*
-		 * Wrapper handler special case: see
-		 * i386/intr_machdep.c::intr_execute_handlers()
-		 */
-		if (!thread) {
-			if (ret == FILTER_SCHEDULE_THREAD)
-				thread = 1;
-		}
-	}
-
-	/*
-	 * If there are any threaded handlers that need to run,
-	 * mask the source as well as sending it an EOI.  Otherwise,
-	 * just send it an EOI but leave it unmasked.
-	 */
-	if (thread)
-		isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
-	else
-		isrc->is_pic->pic_eoi_source(isrc);
-
-	/* Schedule the ithread if needed. */
-	if (thread) {
-		error = intr_event_schedule_thread(ie);
-		KASSERT(error == 0, ("bad stray interrupt"));
-	}
-	critical_exit();
-	td->td_intr_nesting_level--;
 }
-#endif
 
 void
 intr_resume(void)

Modified: stable/7/sys/arm/arm/intr.c
==============================================================================
--- stable/7/sys/arm/arm/intr.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/arm/arm/intr.c	Tue May 19 19:45:36 2009	(r192406)
@@ -72,7 +72,7 @@ arm_setup_irqhandler(const char *name, d
 	if (event == NULL) {
 		error = intr_event_create(&event, (void *)irq, 0,
 		    (mask_fn)arm_mask_irq, (mask_fn)arm_unmask_irq,
-		    (mask_fn)arm_unmask_irq, NULL, "intr%d:", irq);
+		    NULL, NULL, "intr%d:", irq);
 		if (error)
 			return;
 		intr_events[irq] = event;
@@ -106,57 +106,17 @@ arm_handler_execute(struct trapframe *fr
 {
 	struct intr_event *event;
 	struct thread *td = curthread;
-#ifdef INTR_FILTER
 	int i;
-#else
-	int i, thread, ret;
-	struct intr_handler *ih;
-#endif
 
 	PCPU_INC(cnt.v_intr);
 	td->td_intr_nesting_level++;
 	while ((i = arm_get_next_irq()) != -1) {
-#ifndef INTR_FILTER
-		arm_mask_irq(i);
-#endif
 		intrcnt[intrcnt_tab[i]]++;
 		event = intr_events[i];
-		if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
-#ifdef INTR_FILTER
+		if (intr_event_handle(event, frame) != 0) {
+			/* XXX: Log stray IRQs */
 			arm_mask_irq(i);
-#endif
-			continue;
 		}
-
-#ifdef INTR_FILTER
-		intr_event_handle(event, frame);
-		/* XXX: Log stray IRQs */
-#else
-		/* Execute fast handlers. */
-		ret = 0;
-		thread = 0;
-		TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) {
-			if (ih->ih_filter == NULL)
-				thread = 1;
-			else
-				ret = ih->ih_filter(ih->ih_argument ?
-				    ih->ih_argument : frame);
-			/*
-			 * Wrapper handler special case: see
-			 * i386/intr_machdep.c::intr_execute_handlers()
-			 */
-			if (!thread) {
-				if (ret == FILTER_SCHEDULE_THREAD)
-					thread = 1;
-			}
-		}
-
-		/* Schedule thread if needed. */
-		if (thread)
-			intr_event_schedule_thread(event);
-		else
-			arm_unmask_irq(i);
-#endif
 	}
 	td->td_intr_nesting_level--;
 }

Modified: stable/7/sys/i386/i386/intr_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/intr_machdep.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/i386/i386/intr_machdep.c	Tue May 19 19:45:36 2009	(r192406)
@@ -76,9 +76,6 @@ static void	intr_assign_next_cpu(struct 
 
 static int	intr_assign_cpu(void *arg, u_char cpu);
 static void	intr_disable_src(void *arg);
-#ifdef INTR_FILTER
-static void	intr_event_stray(void *cookie);
-#endif
 static void	intr_init(void *__dummy);
 static int	intr_pic_registered(struct pic *pic);
 static void	intrcnt_setname(const char *name, int index);
@@ -229,66 +226,12 @@ intr_disable_src(void *arg)
 	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
 }
 
-#ifdef INTR_FILTER
 void
 intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
 {
-	struct thread *td;
 	struct intr_event *ie;
-	int vector;
-
-	td = curthread;
-
-	/*
-	 * We count software interrupts when we process them.  The
-	 * code here follows previous practice, but there's an
-	 * argument for counting hardware interrupts when they're
-	 * processed too.
-	 */
-	(*isrc->is_count)++;
-	PCPU_INC(cnt.v_intr);
-
-	ie = isrc->is_event;
-
-	/*
-	 * XXX: We assume that IRQ 0 is only used for the ISA timer
-	 * device (clk).
-	 */
-	vector = isrc->is_pic->pic_vector(isrc);
-	if (vector == 0)
-		clkintr_pending = 1;
-
-	if (intr_event_handle(ie, frame) != 0)
-		intr_event_stray(isrc);		
-}
-
-static void
-intr_event_stray(void *cookie)
-{
-	struct intsrc *isrc;
-
-	isrc = cookie;
-	/*
-	 * For stray interrupts, mask and EOI the source, bump the
-	 * stray count, and log the condition.
-	 */
-	isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
-	(*isrc->is_straycount)++;
-	if (*isrc->is_straycount < MAX_STRAY_LOG)
-		log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc));
-	else if (*isrc->is_straycount == MAX_STRAY_LOG)
-		log(LOG_CRIT,
-		    "too many stray irq %d's: not logging anymore\n",
-		    isrc->is_pic->pic_vector(isrc));
-}
-#else
-void
-intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
-{
 	struct thread *td;
-	struct intr_event *ie;
-	struct intr_handler *ih;
-	int error, vector, thread, ret;
+	int vector;
 
 	td = curthread;
 
@@ -315,7 +258,7 @@ intr_execute_handlers(struct intsrc *isr
 	 * For stray interrupts, mask and EOI the source, bump the
 	 * stray count, and log the condition.
 	 */
-	if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) {
+	if (intr_event_handle(ie, frame) != 0) {
 		isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
 		(*isrc->is_straycount)++;
 		if (*isrc->is_straycount < MAX_STRAY_LOG)
@@ -324,70 +267,8 @@ intr_execute_handlers(struct intsrc *isr
 			log(LOG_CRIT,
 			    "too many stray irq %d's: not logging anymore\n",
 			    vector);
-		return;
 	}
-
-	/*
-	 * Execute fast interrupt handlers directly.
-	 * To support clock handlers, if a handler registers
-	 * with a NULL argument, then we pass it a pointer to
-	 * a trapframe as its argument.
-	 */
-	td->td_intr_nesting_level++;
-	ret = 0;
-	thread = 0;
-	critical_enter();
-	TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
-		if (ih->ih_filter == NULL) {
-			thread = 1;
-			continue;
-		}
-		CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
-		    ih->ih_filter, ih->ih_argument == NULL ? frame :
-		    ih->ih_argument, ih->ih_name);
-		if (ih->ih_argument == NULL)
-			ret = ih->ih_filter(frame);
-		else
-			ret = ih->ih_filter(ih->ih_argument);
-		/* 
-		 * Wrapper handler special handling:
-		 *
-		 * in some particular cases (like pccard and pccbb), 
-		 * the _real_ device handler is wrapped in a couple of
-		 * functions - a filter wrapper and an ithread wrapper.
-		 * In this case (and just in this case), the filter wrapper 
-		 * could ask the system to schedule the ithread and mask
-		 * the interrupt source if the wrapped handler is composed
-		 * of just an ithread handler.
-		 *
-		 * TODO: write a generic wrapper to avoid people rolling 
-		 * their own
-		 */
-		if (!thread) {
-			if (ret == FILTER_SCHEDULE_THREAD)
-				thread = 1;
-		}
-	}
-
-	/*
-	 * If there are any threaded handlers that need to run,
-	 * mask the source as well as sending it an EOI.  Otherwise,
-	 * just send it an EOI but leave it unmasked.
-	 */
-	if (thread)
-		isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
-	else
-		isrc->is_pic->pic_eoi_source(isrc);
-
-	/* Schedule the ithread if needed. */
-	if (thread) {
-		error = intr_event_schedule_thread(ie);
-		KASSERT(error == 0, ("bad stray interrupt"));
-	}
-	critical_exit();
-	td->td_intr_nesting_level--;
 }
-#endif
 
 void
 intr_resume(void)

Modified: stable/7/sys/ia64/ia64/interrupt.c
==============================================================================
--- stable/7/sys/ia64/ia64/interrupt.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/ia64/ia64/interrupt.c	Tue May 19 19:45:36 2009	(r192406)
@@ -385,10 +385,6 @@ ia64_dispatch_intr(void *frame, u_int ve
 {
 	struct ia64_intr *i;
 	struct intr_event *ie;			/* our interrupt event */
-#ifndef INTR_FILTER
-	struct intr_handler *ih;
-	int error, thread, ret;
-#endif
 
 	/*
 	 * Find the interrupt thread for this vector.
@@ -401,52 +397,14 @@ ia64_dispatch_intr(void *frame, u_int ve
 	ie = i->event;
 	KASSERT(ie != NULL, ("%s: interrupt without event", __func__));
 
-#ifdef INTR_FILTER
 	if (intr_event_handle(ie, frame) != 0) {
-		ia64_intr_mask((void *)(uintptr_t)vector);
-		log(LOG_ERR, "stray irq%u\n", i->irq);
-	}
-#else
-	/*
-	 * As an optimization, if an event has no handlers, don't
-	 * schedule it to run.
-	 */
-	if (TAILQ_EMPTY(&ie->ie_handlers))
-		return;
-
-	/*
-	 * Execute all fast interrupt handlers directly without Giant.  Note
-	 * that this means that any fast interrupt handler must be MP safe.
-	 */
-	ret = 0;
-	thread = 0;
-	critical_enter();
-	TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
-		if (ih->ih_filter == NULL) {
-			thread = 1;
-			continue;
-		}
-		CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
-		    ih->ih_filter, ih->ih_argument, ih->ih_name);
-		ret = ih->ih_filter(ih->ih_argument);
 		/*
-		 * Wrapper handler special case: see
-		 * i386/intr_machdep.c::intr_execute_handlers()
+		 * XXX: The pre-INTR_FILTER code didn't mask stray
+		 * interrupts.
 		 */
-		if (!thread) {
-			if (ret == FILTER_SCHEDULE_THREAD)
-				thread = 1;
-		}
-	}
-
-	if (thread) {
 		ia64_intr_mask((void *)(uintptr_t)vector);
-		error = intr_event_schedule_thread(ie);
-		KASSERT(error == 0, ("%s: impossible stray", __func__));
-	} else
-		ia64_intr_eoi((void *)(uintptr_t)vector);
-	critical_exit();
-#endif
+		log(LOG_ERR, "stray irq%u\n", i->irq);
+	}
 }
 
 #ifdef DDB

Modified: stable/7/sys/kern/kern_intr.c
==============================================================================
--- stable/7/sys/kern/kern_intr.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/kern/kern_intr.c	Tue May 19 19:45:36 2009	(r192406)
@@ -94,9 +94,14 @@ static TAILQ_HEAD(, intr_event) event_li
 
 static void	intr_event_update(struct intr_event *ie);
 #ifdef INTR_FILTER
+static int	intr_event_schedule_thread(struct intr_event *ie,
+		    struct intr_thread *ithd);
+static int	intr_filter_loop(struct intr_event *ie,
+		    struct trapframe *frame, struct intr_thread **ithd);
 static struct intr_thread *ithread_create(const char *name,
 			      struct intr_handler *ih);
 #else
+static int	intr_event_schedule_thread(struct intr_event *ie);
 static struct intr_thread *ithread_create(const char *name);
 #endif
 static void	ithread_destroy(struct intr_thread *ithread);
@@ -240,8 +245,9 @@ intr_event_update(struct intr_event *ie)
 
 int
 intr_event_create(struct intr_event **event, void *source,int flags,
-    void (*disable)(void *), void (*enable)(void *), void (*eoi)(void *),
-    int (*assign_cpu)(void *, u_char), const char *fmt, ...)
+    void (*pre_ithread)(void *), void (*post_ithread)(void *),
+    void (*post_filter)(void *), int (*assign_cpu)(void *, u_char),
+    const char *fmt, ...)
 {
 	struct intr_event *ie;
 	va_list ap;
@@ -251,9 +257,9 @@ intr_event_create(struct intr_event **ev
 		return (EINVAL);
 	ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO);
 	ie->ie_source = source;
-	ie->ie_disable = disable;
-	ie->ie_enable = enable;
-	ie->ie_eoi = eoi;
+	ie->ie_pre_ithread = pre_ithread;
+	ie->ie_post_ithread = post_ithread;
+	ie->ie_post_filter = post_filter;
 	ie->ie_assign_cpu = assign_cpu;
 	ie->ie_flags = flags;
 	ie->ie_cpu = NOCPU;
@@ -678,7 +684,7 @@ ok:
 	return (0);
 }
 
-int
+static int
 intr_event_schedule_thread(struct intr_event *ie)
 {
 	struct intr_entropy entropy;
@@ -835,7 +841,7 @@ ok:
 	return (0);
 }
 
-int
+static int
 intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *it)
 {
 	struct intr_entropy entropy;
@@ -1078,8 +1084,8 @@ ithread_execute_handlers(struct proc *p,
 	 * Now that all the handlers have had a chance to run, reenable
 	 * the interrupt source.
 	 */
-	if (ie->ie_enable != NULL)
-		ie->ie_enable(ie->ie_source);
+	if (ie->ie_post_ithread != NULL)
+		ie->ie_post_ithread(ie->ie_source);
 }
 
 #ifndef INTR_FILTER
@@ -1166,6 +1172,90 @@ ithread_loop(void *arg)
 		thread_unlock(td);
 	}
 }
+
+/*
+ * Main interrupt handling body.
+ *
+ * Input:
+ * o ie:                        the event connected to this interrupt.
+ * o frame:                     some archs (i.e. i386) pass a frame to some.
+ *                              handlers as their main argument.
+ * Return value:
+ * o 0:                         everything ok.
+ * o EINVAL:                    stray interrupt.
+ */
+int
+intr_event_handle(struct intr_event *ie, struct trapframe *frame)
+{
+	struct intr_handler *ih;
+	struct thread *td;
+	int error, ret, thread;
+
+	td = curthread;
+
+	/* An interrupt with no event or handlers is a stray interrupt. */
+	if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers))
+		return (EINVAL);
+
+	/*
+	 * Execute fast interrupt handlers directly.
+	 * To support clock handlers, if a handler registers
+	 * with a NULL argument, then we pass it a pointer to
+	 * a trapframe as its argument.
+	 */
+	td->td_intr_nesting_level++;
+	thread = 0;
+	ret = 0;
+	critical_enter();
+	TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
+		if (ih->ih_filter == NULL) {
+			thread = 1;
+			continue;
+		}
+		CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
+		    ih->ih_filter, ih->ih_argument == NULL ? frame :
+		    ih->ih_argument, ih->ih_name);
+		if (ih->ih_argument == NULL)
+			ret = ih->ih_filter(frame);
+		else
+			ret = ih->ih_filter(ih->ih_argument);
+		/* 
+		 * Wrapper handler special handling:
+		 *
+		 * in some particular cases (like pccard and pccbb), 
+		 * the _real_ device handler is wrapped in a couple of
+		 * functions - a filter wrapper and an ithread wrapper.
+		 * In this case (and just in this case), the filter wrapper 
+		 * could ask the system to schedule the ithread and mask
+		 * the interrupt source if the wrapped handler is composed
+		 * of just an ithread handler.
+		 *
+		 * TODO: write a generic wrapper to avoid people rolling 
+		 * their own
+		 */
+		if (!thread) {
+			if (ret == FILTER_SCHEDULE_THREAD)
+				thread = 1;
+		}
+	}
+
+	if (thread) {
+		if (ie->ie_pre_ithread != NULL)
+			ie->ie_pre_ithread(ie->ie_source);
+	} else {
+		if (ie->ie_post_filter != NULL)
+			ie->ie_post_filter(ie->ie_source);
+	}
+	
+	/* Schedule the ithread if needed. */
+	if (thread) {
+		error = intr_event_schedule_thread(ie);
+		KASSERT(error == 0, ("bad stray interrupt"));
+	}
+	critical_exit();
+	td->td_intr_nesting_level--;
+	return (0);
+}
 #else
 /*
  * This is the main code for interrupt threads.
@@ -1281,7 +1371,7 @@ ithread_loop(void *arg)
  * scheduled.
  */
 
-int
+static int
 intr_filter_loop(struct intr_event *ie, struct trapframe *frame, 
 		 struct intr_thread **ithd) 
 {
@@ -1357,19 +1447,13 @@ intr_event_handle(struct intr_event *ie,
 	td->td_intr_nesting_level++;
 	thread = 0;
 	critical_enter();
-	thread = intr_filter_loop(ie, frame, &ithd);
-	
-	/*
-	 * If the interrupt was fully served, send it an EOI but leave
-	 * it unmasked. Otherwise, mask the source as well as sending
-	 * it an EOI.
-	 */
+	thread = intr_filter_loop(ie, frame, &ithd);	
 	if (thread & FILTER_HANDLED) {
-		if (ie->ie_eoi != NULL)
-			ie->ie_eoi(ie->ie_source);
+		if (ie->ie_post_filter != NULL)
+			ie->ie_post_filter(ie->ie_source);
 	} else {
-		if (ie->ie_disable != NULL)
-			ie->ie_disable(ie->ie_source);
+		if (ie->ie_pre_ithread != NULL)
+			ie->ie_pre_ithread(ie->ie_source);
 	}
 	critical_exit();
 	

Modified: stable/7/sys/powerpc/powerpc/intr_machdep.c
==============================================================================
--- stable/7/sys/powerpc/powerpc/intr_machdep.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/powerpc/powerpc/intr_machdep.c	Tue May 19 19:45:36 2009	(r192406)
@@ -228,10 +228,6 @@ powerpc_dispatch_intr(u_int vector, stru
 {
 	struct powerpc_intr *i;
 	struct intr_event *ie;
-#ifndef INTR_FILTER
-	struct intr_handler *ih;
-	int error, sched, ret;
-#endif
 
 	i = powerpc_intrs[vector];
 	if (i == NULL)
@@ -242,55 +238,15 @@ powerpc_dispatch_intr(u_int vector, stru
 	ie = i->event;
 	KASSERT(ie != NULL, ("%s: interrupt without an event", __func__));
 
-#ifdef INTR_FILTER
 	if (intr_event_handle(ie, tf) != 0) {
-		PIC_MASK(pic, i->irq);
-		log(LOG_ERR, "stray irq%u\n", i->irq);
-	}
-#else
-	if (TAILQ_EMPTY(&ie->ie_handlers))
 		goto stray;
-
-	/*
-	 * Execute all fast interrupt handlers directly without Giant.  Note
-	 * that this means that any fast interrupt handler must be MP safe.
-	 */
-	ret = 0;
-	sched = 0;
-	critical_enter();
-	TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
-		if (ih->ih_filter == NULL) {
-			sched = 1;
-			continue;
-		}
-		CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
-		    ih->ih_filter, ih->ih_argument, ih->ih_name);
-		ret = ih->ih_filter(ih->ih_argument);
-		/*
-		 * Wrapper handler special case: see
-		 * i386/intr_machdep.c::intr_execute_handlers()
-		 */
-		if (!sched) {
-			if (ret == FILTER_SCHEDULE_THREAD)
-				sched = 1;
-		}
 	}
-
-	if (sched) {
-		PIC_MASK(pic, i->irq);
-		error = intr_event_schedule_thread(ie);
-		KASSERT(error == 0, ("%s: impossible stray interrupt",
-		    __func__));
-	} else
-		PIC_EOI(pic, i->irq);
-	critical_exit();
-#endif
 	return;
 
 stray:
 	stray_count++;
 	if (stray_count <= MAX_STRAY_LOG) {
-		printf("stray irq %d\n", i->irq);
+		printf("stray irq %d\n", i ? i->irq : -1);
 		if (stray_count >= MAX_STRAY_LOG) {
 			printf("got %d stray interrupts, not logging anymore\n",
 			    MAX_STRAY_LOG);

Modified: stable/7/sys/sparc64/sparc64/intr_machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/intr_machdep.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/sparc64/sparc64/intr_machdep.c	Tue May 19 19:45:36 2009	(r192406)
@@ -275,57 +275,9 @@ static void
 intr_execute_handlers(void *cookie)
 {
 	struct intr_vector *iv;
-#ifndef INTR_FILTER
-	struct intr_event *ie;
-	struct intr_handler *ih;
-	int error, thread, ret;
-#endif
 
 	iv = cookie;
-#ifndef INTR_FILTER
-	ie = iv->iv_event;
-	if (iv->iv_ic == NULL || ie == NULL) {
-		intr_stray_vector(iv);
-		return;
-	}
-
-	/* Execute fast interrupt handlers directly. */
-	ret = 0;
-	thread = 0;
-	critical_enter();
-	TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
-		if (ih->ih_filter == NULL) {
-			thread = 1;
-			continue;
-		}
-		MPASS(ih->ih_filter != NULL && ih->ih_argument != NULL);
-		CTR3(KTR_INTR, "%s: executing handler %p(%p)", __func__,
-		    ih->ih_filter, ih->ih_argument);
-		ret = ih->ih_filter(ih->ih_argument);
-		/*
-		 * Wrapper handler special case: see
-		 * i386/intr_machdep.c::intr_execute_handlers()
-		 */
-		if (!thread) {
-			if (ret == FILTER_SCHEDULE_THREAD)
-				thread = 1;
-		}
-	}
-	if (!thread)
-		iv->iv_ic->ic_clear(iv);
-
-	/* Schedule a heavyweight interrupt process. */
-	if (thread)
-		error = intr_event_schedule_thread(ie);
-	else if (TAILQ_EMPTY(&ie->ie_handlers))
-		error = EINVAL;
-	else
-		error = 0;
-	critical_exit();
-	if (error == EINVAL)
-#else
 	if (iv->iv_ic == NULL || intr_event_handle(iv->iv_event, NULL) != 0)
-#endif
 		intr_stray_vector(iv);
 }
 

Modified: stable/7/sys/sun4v/sun4v/intr_machdep.c
==============================================================================
--- stable/7/sys/sun4v/sun4v/intr_machdep.c	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/sun4v/sun4v/intr_machdep.c	Tue May 19 19:45:36 2009	(r192406)
@@ -101,12 +101,6 @@ struct intr_vector intr_vectors[IV_MAX];
 uint16_t intr_countp[IV_MAX];
 static u_long intr_stray_count[IV_MAX];
 
-struct ithread_vector_handler {
-	iv_func_t *ivh_handler;
-	void *ivh_arg;
-	u_int ivh_vec;
-};
-
 static char *pil_names[] = {
 	"stray",
 	"low",		/* PIL_LOW */
@@ -276,63 +270,23 @@ intr_init(void)
 }
 SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL);
 
+static void
+intr_enable(void *cookie)
+{
+	int vec;
+
+	vec = (uintptr_t)cookie;
+	hv_intr_setstate(vec, HV_INTR_IDLE_STATE);
+}
 
 static void
 intr_execute_handlers(void *cookie)
 {
 	struct intr_vector *iv;
-	struct intr_event *ie;
-	struct intr_handler *ih;
-	int fast, thread, ret;
 
 	iv = cookie;
-	ie = iv->iv_event;
-	if (ie == NULL) {
-		intr_stray_vector(iv);
-		return;
-	}
-	
-	ret = 0;
-	fast = thread = 0;
-	TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
-		if (ih->ih_filter == NULL) {
-			thread = 1;
-			continue;
-		}
-		MPASS(ih->ih_filter != NULL && ih->ih_argument != NULL);
-		CTR3(KTR_INTR, "%s: executing handler %p(%p)", __func__,
-		    ih->ih_filter, ih->ih_argument);
-		ret = ih->ih_filter(ih->ih_argument);
-		fast = 1;
-		/*
-		 * Wrapper handler special case: see
-		 * i386/intr_machdep.c::intr_execute_handlers()
-		 */
-		if (!thread) {
-			if (ret == FILTER_SCHEDULE_THREAD)
-				thread = 1;
-		}
-	}
-
-	/* Schedule a heavyweight interrupt process. */
-	if (thread) 
-		intr_event_schedule_thread(ie);
-	else if (TAILQ_EMPTY(&ie->ie_handlers))
+	if (intr_event_handle(iv->iv_event, NULL) != 0)
 		intr_stray_vector(iv);
-
-	if (fast)
-		hv_intr_setstate(iv->iv_vec, HV_INTR_IDLE_STATE);
-
-}
-
-static void
-ithread_wrapper(void *arg)
-{
-	struct ithread_vector_handler *ivh = (struct ithread_vector_handler *)arg;
-	
-	ivh->ivh_handler(ivh->ivh_arg);
-	/* re-enable interrupt */
-	hv_intr_setstate(ivh->ivh_vec, HV_INTR_IDLE_STATE);
 }
 
 int
@@ -342,13 +296,8 @@ inthand_add(const char *name, int vec, d
 	struct intr_vector *iv;
 	struct intr_event *ie;		/* descriptor for the IRQ */
 	struct intr_event *orphan;
-	struct ithread_vector_handler *ivh;
 	int errcode, pil;
 
-	if (filt != NULL && handler != NULL) {
-		printf("both filt and handler set is not valid\n");
-		return (EINVAL);
-	}
 	/*
 	 * Work around a race where more than one CPU may be registering
 	 * handlers on the same IRQ at the same time.
@@ -359,7 +308,7 @@ inthand_add(const char *name, int vec, d
 	mtx_unlock_spin(&intr_table_lock);
 	if (ie == NULL) {
 		errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, NULL,
-		    NULL, "vec%d:", vec);
+		    intr_enable, intr_enable, NULL, "vec%d:", vec);
 		if (errcode)
 			return (errcode);
 		mtx_lock_spin(&intr_table_lock);
@@ -374,26 +323,12 @@ inthand_add(const char *name, int vec, d
 		}
 	}
 
-	if (filt == NULL) {
-		ivh = (struct ithread_vector_handler *)
-			malloc(sizeof(struct ithread_vector_handler), M_DEVBUF, M_WAITOK);
-		ivh->ivh_handler = (driver_intr_t *)handler;
-		ivh->ivh_arg = arg;
-		ivh->ivh_vec = vec;
-		errcode = intr_event_add_handler(ie, name, NULL, ithread_wrapper, ivh,
-						 intr_priority(flags), flags, cookiep);
-	} else {
-		ivh = NULL;
-		errcode = intr_event_add_handler(ie, name, filt, NULL, arg,
-						 intr_priority(flags), flags, 
-						 cookiep);
-	}
+	errcode = intr_event_add_handler(ie, name, filt, handler, arg,
+	    intr_priority(flags), flags, cookiep);
 
-	if (errcode) {
-		if (ivh)
-			free(ivh, M_DEVBUF);
+	if (errcode)
 		return (errcode);
-	}
+
 	pil = (filt != NULL) ? PIL_FAST : PIL_ITHREAD;
 
 	intr_setup(pil, intr_fast, vec, intr_execute_handlers, iv);

Modified: stable/7/sys/sys/interrupt.h
==============================================================================
--- stable/7/sys/sys/interrupt.h	Tue May 19 19:27:07 2009	(r192405)
+++ stable/7/sys/sys/interrupt.h	Tue May 19 19:45:36 2009	(r192406)
@@ -63,6 +63,33 @@ struct intr_handler {
 
 /*
  * Describe an interrupt event.  An event holds a list of handlers.
+ * The 'pre_ithread', 'post_ithread', 'post_filter', and 'assign_cpu'
+ * hooks are used to invoke MD code for certain operations.
+ *
+ * The 'pre_ithread' hook is called when an interrupt thread for
+ * handlers without filters is scheduled.  It is responsible for
+ * ensuring that 1) the system won't be swamped with an interrupt
+ * storm from the associated source while the ithread runs and 2) the
+ * current CPU is able to receive interrupts from other interrupt
+ * sources.  The first is usually accomplished by disabling
+ * level-triggered interrupts until the ithread completes.  The second
+ * is accomplished on some platforms by acknowledging the interrupt
+ * via an EOI.
+ *
+ * The 'post_ithread' hook is invoked when an ithread finishes.  It is
+ * responsible for ensuring that the associated interrupt source will
+ * trigger an interrupt when it is asserted in the future.  Usually
+ * this is implemented by enabling a level-triggered interrupt that
+ * was previously disabled via the 'pre_ithread' hook.
+ *
+ * The 'post_filter' hook is invoked when a filter handles an
+ * interrupt.  It is responsible for ensuring that the current CPU is
+ * able to receive interrupts again.  On some platforms this is done
+ * by acknowledging the interrupts via an EOI.
+ *
+ * The 'assign_cpu' hook is used to bind an interrupt source to a
+ * specific CPU.  If the interrupt cannot be bound, this function may
+ * return an error.
  */
 struct intr_event {
 	TAILQ_ENTRY(intr_event) ie_list;
@@ -72,9 +99,9 @@ struct intr_event {
 	struct mtx	ie_lock;
 	void		*ie_source;	/* Cookie used by MD code. */
 	struct intr_thread *ie_thread;	/* Thread we are connected to. */
-	void		(*ie_disable)(void *);
-	void		(*ie_enable)(void *);
-	void		(*ie_eoi)(void *);
+	void		(*ie_pre_ithread)(void *);
+	void		(*ie_post_ithread)(void *);
+	void		(*ie_post_filter)(void *);
 	int		(*ie_assign_cpu)(void *, u_char);
 	int		ie_flags;
 	int		ie_count;	/* Loop counter. */
@@ -118,29 +145,19 @@ extern char 	intrnames[];	/* string tabl
 #ifdef DDB
 void	db_dump_intr_event(struct intr_event *ie, int handlers);
 #endif
-#ifdef INTR_FILTER
-int     intr_filter_loop(struct intr_event *ie, struct trapframe *frame, 
-			 struct intr_thread **ithd);
-int     intr_event_handle(struct intr_event *ie, struct trapframe *frame);
-#endif
 u_char	intr_priority(enum intr_type flags);
 int	intr_event_add_handler(struct intr_event *ie, const char *name,
 	    driver_filter_t filter, driver_intr_t handler, void *arg, 
 	    u_char pri, enum intr_type flags, void **cookiep);	    
 int	intr_event_bind(struct intr_event *ie, u_char cpu);
 int	intr_event_create(struct intr_event **event, void *source,
-	    int flags, void (*disable)(void *), void (*enable)(void *),
-	    void (*eoi)(void *), int (*assign_cpu)(void *, u_char),
-	    const char *fmt, ...)
+	    int flags, void (*pre_ithread)(void *),
+	    void (*post_ithread)(void *), void (*post_filter)(void *),
+	    int (*assign_cpu)(void *, u_char), const char *fmt, ...)
 	    __printflike(8, 9);
 int	intr_event_destroy(struct intr_event *ie);
+int	intr_event_handle(struct intr_event *ie, struct trapframe *frame);
 int	intr_event_remove_handler(void *cookie);
-#ifndef INTR_FILTER
-int	intr_event_schedule_thread(struct intr_event *ie);
-#else
-int	intr_event_schedule_thread(struct intr_event *ie,
-	    struct intr_thread *ithd);
-#endif
 void	*intr_handler_source(void *cookie);

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From jhb at FreeBSD.org  Tue May 19 22:07:56 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 19 22:08:19 2009
Subject: svn commit: r192409 - in stable/7: sys sys/amd64/amd64 sys/arm/arm
	sys/contrib/pf sys/dev/ath/ath_hal sys/dev/cxgb sys/i386/i386
	sys/ia64/ia64 sys/kern sys/powerpc/powerpc
	sys/sparc64/sparc64 sys/s...
Message-ID: <200905192207.n4JM7spY011238@svn.freebsd.org>

Author: jhb
Date: Tue May 19 22:07:54 2009
New Revision: 192409
URL: http://svn.freebsd.org/changeset/base/192409

Log:
  MFC:
  - Add the interrupt vector number to intr_event_create so MI code can
    lookup hard interrupt events by number.
  - Add support to cpuset for binding hardware interrupts.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/intr_machdep.c
  stable/7/sys/arm/arm/intr.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/i386/intr_machdep.c
  stable/7/sys/ia64/ia64/interrupt.c
  stable/7/sys/kern/kern_cpuset.c
  stable/7/sys/kern/kern_intr.c
  stable/7/sys/powerpc/powerpc/intr_machdep.c
  stable/7/sys/sparc64/sparc64/intr_machdep.c
  stable/7/sys/sun4v/sun4v/intr_machdep.c
  stable/7/sys/sys/cpuset.h
  stable/7/sys/sys/interrupt.h
  stable/7/usr.bin/cpuset/   (props changed)
  stable/7/usr.bin/cpuset/cpuset.1
  stable/7/usr.bin/cpuset/cpuset.c

Modified: stable/7/sys/amd64/amd64/intr_machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/intr_machdep.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/amd64/amd64/intr_machdep.c	Tue May 19 22:07:54 2009	(r192409)
@@ -139,7 +139,7 @@ intr_register_source(struct intsrc *isrc
 	vector = isrc->is_pic->pic_vector(isrc);
 	if (interrupt_sources[vector] != NULL)
 		return (EEXIST);
-	error = intr_event_create(&isrc->is_event, isrc, 0,
+	error = intr_event_create(&isrc->is_event, isrc, 0, vector,
 	    intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source,
 	    (mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:",
 	    vector);

Modified: stable/7/sys/arm/arm/intr.c
==============================================================================
--- stable/7/sys/arm/arm/intr.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/arm/arm/intr.c	Tue May 19 22:07:54 2009	(r192409)
@@ -70,7 +70,7 @@ arm_setup_irqhandler(const char *name, d
 		return;
 	event = intr_events[irq];
 	if (event == NULL) {
-		error = intr_event_create(&event, (void *)irq, 0,
+		error = intr_event_create(&event, (void *)irq, 0, irq,
 		    (mask_fn)arm_mask_irq, (mask_fn)arm_unmask_irq,
 		    NULL, NULL, "intr%d:", irq);
 		if (error)

Modified: stable/7/sys/i386/i386/intr_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/intr_machdep.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/i386/i386/intr_machdep.c	Tue May 19 22:07:54 2009	(r192409)
@@ -130,7 +130,7 @@ intr_register_source(struct intsrc *isrc
 	vector = isrc->is_pic->pic_vector(isrc);
 	if (interrupt_sources[vector] != NULL)
 		return (EEXIST);
-	error = intr_event_create(&isrc->is_event, isrc, 0,
+	error = intr_event_create(&isrc->is_event, isrc, 0, vector,
 	    intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source,
 	    (mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:",
 	    vector);

Modified: stable/7/sys/ia64/ia64/interrupt.c
==============================================================================
--- stable/7/sys/ia64/ia64/interrupt.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/ia64/ia64/interrupt.c	Tue May 19 22:07:54 2009	(r192409)
@@ -340,7 +340,7 @@ ia64_setup_intr(const char *name, int ir
 			return (ENOMEM);
 
 		error = intr_event_create(&i->event, (void *)(uintptr_t)vector,
-		    0, ia64_intr_mask, ia64_intr_unmask, ia64_intr_eoi,
+		    0, irq, ia64_intr_mask, ia64_intr_unmask, ia64_intr_eoi,
 		    NULL, "irq%u:", irq);
 		if (error) {
 			free(i, M_DEVBUF);

Modified: stable/7/sys/kern/kern_cpuset.c
==============================================================================
--- stable/7/sys/kern/kern_cpuset.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/kern/kern_cpuset.c	Tue May 19 22:07:54 2009	(r192409)
@@ -469,6 +469,8 @@ cpuset_which(cpuwhich_t which, id_t id, 
 		}
 		return (ESRCH);
 	}
+	case CPU_WHICH_IRQ:
+		return (0);
 	default:
 		return (EINVAL);
 	}
@@ -875,6 +877,8 @@ cpuset_getid(struct thread *td, struct c
 	case CPU_WHICH_CPUSET:
 	case CPU_WHICH_JAIL:
 		break;
+	case CPU_WHICH_IRQ:
+		return (EINVAL);
 	}
 	switch (uap->level) {
 	case CPU_LEVEL_ROOT:
@@ -936,6 +940,9 @@ cpuset_getaffinity(struct thread *td, st
 		case CPU_WHICH_CPUSET:
 		case CPU_WHICH_JAIL:
 			break;
+		case CPU_WHICH_IRQ:
+			error = EINVAL;
+			goto out;
 		}
 		if (uap->level == CPU_LEVEL_ROOT)
 			nset = cpuset_refroot(set);
@@ -964,6 +971,9 @@ cpuset_getaffinity(struct thread *td, st
 		case CPU_WHICH_JAIL:
 			CPU_COPY(&set->cs_mask, mask);
 			break;
+		case CPU_WHICH_IRQ:
+			error = intr_getaffinity(uap->id, mask);
+			break;
 		}
 		break;
 	default:
@@ -1041,6 +1051,9 @@ cpuset_setaffinity(struct thread *td, st
 		case CPU_WHICH_CPUSET:
 		case CPU_WHICH_JAIL:
 			break;
+		case CPU_WHICH_IRQ:
+			error = EINVAL;
+			goto out;
 		}
 		if (uap->level == CPU_LEVEL_ROOT)
 			nset = cpuset_refroot(set);
@@ -1067,6 +1080,9 @@ cpuset_setaffinity(struct thread *td, st
 				cpuset_rel(set);
 			}
 			break;
+		case CPU_WHICH_IRQ:
+			error = intr_setaffinity(uap->id, mask);
+			break;
 		default:
 			error = EINVAL;
 			break;

Modified: stable/7/sys/kern/kern_intr.c
==============================================================================
--- stable/7/sys/kern/kern_intr.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/kern/kern_intr.c	Tue May 19 22:07:54 2009	(r192409)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -91,6 +92,8 @@ SYSCTL_INT(_hw, OID_AUTO, intr_storm_thr
     "Number of consecutive interrupts before storm protection is enabled");
 static TAILQ_HEAD(, intr_event) event_list =
     TAILQ_HEAD_INITIALIZER(event_list);
+static struct mtx event_lock;
+MTX_SYSINIT(intr_event_list, &event_lock, "intr event list", MTX_DEF);
 
 static void	intr_event_update(struct intr_event *ie);
 #ifdef INTR_FILTER
@@ -244,7 +247,7 @@ intr_event_update(struct intr_event *ie)
 }
 
 int
-intr_event_create(struct intr_event **event, void *source,int flags,
+intr_event_create(struct intr_event **event, void *source, int flags, int irq,
     void (*pre_ithread)(void *), void (*post_ithread)(void *),
     void (*post_filter)(void *), int (*assign_cpu)(void *, u_char),
     const char *fmt, ...)
@@ -262,6 +265,7 @@ intr_event_create(struct intr_event **ev
 	ie->ie_post_filter = post_filter;
 	ie->ie_assign_cpu = assign_cpu;
 	ie->ie_flags = flags;
+	ie->ie_irq = irq;
 	ie->ie_cpu = NOCPU;
 	TAILQ_INIT(&ie->ie_handlers);
 	mtx_init(&ie->ie_lock, "intr event", NULL, MTX_DEF);
@@ -270,9 +274,9 @@ intr_event_create(struct intr_event **ev
 	vsnprintf(ie->ie_name, sizeof(ie->ie_name), fmt, ap);
 	va_end(ap);
 	strlcpy(ie->ie_fullname, ie->ie_name, sizeof(ie->ie_fullname));
-	mtx_pool_lock(mtxpool_sleep, &event_list);
+	mtx_lock(&event_lock);
 	TAILQ_INSERT_TAIL(&event_list, ie, ie_list);
-	mtx_pool_unlock(mtxpool_sleep, &event_list);
+	mtx_unlock(&event_lock);
 	if (event != NULL)
 		*event = ie;
 	CTR2(KTR_INTR, "%s: created %s", __func__, ie->ie_name);
@@ -290,7 +294,8 @@ intr_event_create(struct intr_event **ev
 int
 intr_event_bind(struct intr_event *ie, u_char cpu)
 {
-	struct thread *td;
+	cpuset_t mask;
+	lwpid_t id;
 	int error;
 
 	/* Need a CPU to bind to. */
@@ -299,28 +304,95 @@ intr_event_bind(struct intr_event *ie, u
 
 	if (ie->ie_assign_cpu == NULL)
 		return (EOPNOTSUPP);
-
-	/* Don't allow a bind request if the interrupt is already bound. */
+	/*
+	 * If we have any ithreads try to set their mask first since this
+	 * can fail.
+	 */
 	mtx_lock(&ie->ie_lock);
-	if (ie->ie_cpu != NOCPU && cpu != NOCPU) {
+	if (ie->ie_thread != NULL) {
+		CPU_ZERO(&mask);
+		if (cpu == NOCPU)
+			CPU_COPY(cpuset_root, &mask);
+		else
+			CPU_SET(cpu, &mask);
+		id = ie->ie_thread->it_thread->td_tid;
+		mtx_unlock(&ie->ie_lock);
+		error = cpuset_setthread(id, &mask);
+		if (error)
+			return (error);
+	} else
 		mtx_unlock(&ie->ie_lock);
-		return (EBUSY);
-	}
-	mtx_unlock(&ie->ie_lock);
-
 	error = ie->ie_assign_cpu(ie->ie_source, cpu);
 	if (error)
 		return (error);
 	mtx_lock(&ie->ie_lock);
-	if (ie->ie_thread != NULL)
-		td = ie->ie_thread->it_thread;
-	else
-		td = NULL;
-	if (td != NULL)
-		thread_lock(td);
 	ie->ie_cpu = cpu;
-	if (td != NULL)
-		thread_unlock(td);
+	mtx_unlock(&ie->ie_lock);
+
+	return (error);
+}
+
+static struct intr_event *
+intr_lookup(int irq)
+{
+	struct intr_event *ie;
+
+	mtx_lock(&event_lock);
+	TAILQ_FOREACH(ie, &event_list, ie_list)
+		if (ie->ie_irq == irq &&
+		    (ie->ie_flags & IE_SOFT) == 0 &&
+		    TAILQ_FIRST(&ie->ie_handlers) != NULL)
+			break;
+	mtx_unlock(&event_lock);
+	return (ie);
+}
+
+int
+intr_setaffinity(int irq, void *m)
+{
+	struct intr_event *ie;
+	cpuset_t *mask;
+	u_char cpu;
+	int n;
+
+	mask = m;
+	cpu = NOCPU;
+	/*
+	 * If we're setting all cpus we can unbind.  Otherwise make sure
+	 * only one cpu is in the set.
+	 */
+	if (CPU_CMP(cpuset_root, mask)) {
+		for (n = 0; n < CPU_SETSIZE; n++) {
+			if (!CPU_ISSET(n, mask))
+				continue;
+			if (cpu != NOCPU)
+				return (EINVAL);
+			cpu = (u_char)n;
+		}
+	}
+	ie = intr_lookup(irq);
+	if (ie == NULL)
+		return (ESRCH);
+	intr_event_bind(ie, cpu);
+	return (0);
+}
+
+int
+intr_getaffinity(int irq, void *m)
+{
+	struct intr_event *ie;
+	cpuset_t *mask;
+
+	mask = m;
+	ie = intr_lookup(irq);
+	if (ie == NULL)
+		return (ESRCH);
+	CPU_ZERO(mask);
+	mtx_lock(&ie->ie_lock);
+	if (ie->ie_cpu == NOCPU)
+		CPU_COPY(cpuset_root, mask);
+	else
+		CPU_SET(ie->ie_cpu, mask);
 	mtx_unlock(&ie->ie_lock);
 	return (0);
 }
@@ -329,14 +401,14 @@ int
 intr_event_destroy(struct intr_event *ie)
 {
 
+	mtx_lock(&event_lock);
 	mtx_lock(&ie->ie_lock);
 	if (!TAILQ_EMPTY(&ie->ie_handlers)) {
 		mtx_unlock(&ie->ie_lock);
+		mtx_unlock(&event_lock);
 		return (EBUSY);
 	}
-	mtx_pool_lock(mtxpool_sleep, &event_list);
 	TAILQ_REMOVE(&event_list, ie, ie_list);
-	mtx_pool_unlock(mtxpool_sleep, &event_list);
 #ifndef notyet
 	if (ie->ie_thread != NULL) {
 		ithread_destroy(ie->ie_thread);
@@ -344,6 +416,7 @@ intr_event_destroy(struct intr_event *ie
 	}
 #endif
 	mtx_unlock(&ie->ie_lock);
+	mtx_unlock(&event_lock);
 	mtx_destroy(&ie->ie_lock);
 	free(ie, M_ITHREAD);
 	return (0);
@@ -916,7 +989,7 @@ swi_add(struct intr_event **eventp, cons
 		if (!(ie->ie_flags & IE_SOFT))
 			return (EINVAL);
 	} else {
-		error = intr_event_create(&ie, NULL, IE_SOFT,
+		error = intr_event_create(&ie, NULL, IE_SOFT, 0,
 		    NULL, NULL, NULL, NULL, "swi%d:", pri);
 		if (error)
 			return (error);
@@ -1099,7 +1172,6 @@ ithread_loop(void *arg)
 	struct intr_event *ie;
 	struct thread *td;
 	struct proc *p;
-	u_char cpu;
 
 	td = curthread;
 	p = td->td_proc;
@@ -1108,7 +1180,6 @@ ithread_loop(void *arg)
 	    ("%s: ithread and proc linkage out of sync", __func__));
 	ie = ithd->it_event;
 	ie->ie_count = 0;
-	cpu = NOCPU;
 
 	/*
 	 * As long as we have interrupts outstanding, go through the
@@ -1154,21 +1225,6 @@ ithread_loop(void *arg)
 			ie->ie_count = 0;
 			mi_switch(SW_VOL, NULL);
 		}
-
-#ifdef SMP
-		/*
-		 * Ensure we are bound to the correct CPU.  We can't
-		 * move ithreads until SMP is running however, so just
-		 * leave interrupts on the boor CPU during boot.
-		 */
-		if (ie->ie_cpu != cpu && smp_started) {
-			cpu = ie->ie_cpu;
-			if (cpu == NOCPU)
-				sched_unbind(td);
-			else
-				sched_bind(td, cpu);
-		}
-#endif
 		thread_unlock(td);
 	}
 }
@@ -1269,7 +1325,6 @@ ithread_loop(void *arg)
 	struct thread *td;
 	struct proc *p;
 	int priv;
-	u_char cpu;
 
 	td = curthread;
 	p = td->td_proc;
@@ -1280,7 +1335,6 @@ ithread_loop(void *arg)
 	    ("%s: ithread and proc linkage out of sync", __func__));
 	ie = ithd->it_event;
 	ie->ie_count = 0;
-	cpu = NOCPU;
 
 	/*
 	 * As long as we have interrupts outstanding, go through the
@@ -1329,21 +1383,6 @@ ithread_loop(void *arg)
 			ie->ie_count = 0;
 			mi_switch(SW_VOL, NULL);
 		}
-
-#ifdef SMP
-		/*
-		 * Ensure we are bound to the correct CPU.  We can't
-		 * move ithreads until SMP is running however, so just
-		 * leave interrupts on the boor CPU during boot.
-		 */
-		if (!priv && ie->ie_cpu != cpu && smp_started) {
-			cpu = ie->ie_cpu;
-			if (cpu == NOCPU)
-				sched_unbind(td);
-			else
-				sched_bind(td, cpu);
-		}
-#endif
 		thread_unlock(td);
 	}
 }
@@ -1573,8 +1612,6 @@ db_dump_intr_event(struct intr_event *ie
 		db_printf("(pid %d)", it->it_thread->td_proc->p_pid);
 	else
 		db_printf("(no thread)");
-	if (ie->ie_cpu != NOCPU)
-		db_printf(" (CPU %d)", ie->ie_cpu);
 	if ((ie->ie_flags & (IE_SOFT | IE_ENTROPY | IE_ADDING_THREAD)) != 0 ||
 	    (it != NULL && it->it_need)) {
 		db_printf(" {");

Modified: stable/7/sys/powerpc/powerpc/intr_machdep.c
==============================================================================
--- stable/7/sys/powerpc/powerpc/intr_machdep.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/powerpc/powerpc/intr_machdep.c	Tue May 19 22:07:54 2009	(r192409)
@@ -184,7 +184,7 @@ powerpc_setup_intr(const char *name, u_i
 			/* XXX unlock */
 			return (ENOMEM);
 		}
-		error = intr_event_create(&i->event, (void *)irq, 0,
+		error = intr_event_create(&i->event, (void *)irq, 0, irq,
 		    powerpc_intr_mask, powerpc_intr_unmask, powerpc_intr_eoi,
 		    NULL, "irq%u:", irq);
 		if (error) {

Modified: stable/7/sys/sparc64/sparc64/intr_machdep.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/intr_machdep.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/sparc64/sparc64/intr_machdep.c	Tue May 19 22:07:54 2009	(r192409)
@@ -297,7 +297,7 @@ intr_controller_register(int vec, const 
 	sx_xunlock(&intr_table_lock);
 	if (ie != NULL)
 		return (EEXIST);
-	error = intr_event_create(&ie, iv, 0, NULL, ic->ic_clear,
+	error = intr_event_create(&ie, iv, 0, vec, NULL, ic->ic_clear,
 	    ic->ic_clear, intr_assign_cpu, "vec%d:", vec);
 	if (error != 0)
 		return (error);

Modified: stable/7/sys/sun4v/sun4v/intr_machdep.c
==============================================================================
--- stable/7/sys/sun4v/sun4v/intr_machdep.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/sun4v/sun4v/intr_machdep.c	Tue May 19 22:07:54 2009	(r192409)
@@ -307,8 +307,8 @@ inthand_add(const char *name, int vec, d
 	ie = iv->iv_event;
 	mtx_unlock_spin(&intr_table_lock);
 	if (ie == NULL) {
-		errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, NULL,
-		    intr_enable, intr_enable, NULL, "vec%d:", vec);
+		errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, vec,
+		    NULL, intr_enable, intr_enable, NULL, "vec%d:", vec);
 		if (errcode)
 			return (errcode);
 		mtx_lock_spin(&intr_table_lock);

Modified: stable/7/sys/sys/cpuset.h
==============================================================================
--- stable/7/sys/sys/cpuset.h	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/sys/cpuset.h	Tue May 19 22:07:54 2009	(r192409)
@@ -131,7 +131,7 @@ typedef	struct _cpuset {
 #define	CPU_WHICH_TID		1	/* Specifies a thread id. */
 #define	CPU_WHICH_PID		2	/* Specifies a process id. */
 #define	CPU_WHICH_CPUSET	3	/* Specifies a set id. */
-/* CPU_WHICH_IRQ */
+#define	CPU_WHICH_IRQ		4	/* Specifies an irq #. */
 #define	CPU_WHICH_JAIL		5	/* Specifies a jail id. */
 
 /*

Modified: stable/7/sys/sys/interrupt.h
==============================================================================
--- stable/7/sys/sys/interrupt.h	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/sys/sys/interrupt.h	Tue May 19 22:07:54 2009	(r192409)
@@ -107,6 +107,7 @@ struct intr_event {
 	int		ie_count;	/* Loop counter. */
 	int		ie_warncnt;	/* Rate-check interrupt storm warns. */
 	struct timeval	ie_warntm;
+	int		ie_irq;		/* Physical irq number if !SOFT. */
 	u_char		ie_cpu;		/* CPU this event is bound to. */
 };
 
@@ -151,14 +152,16 @@ int	intr_event_add_handler(struct intr_e
 	    u_char pri, enum intr_type flags, void **cookiep);	    
 int	intr_event_bind(struct intr_event *ie, u_char cpu);
 int	intr_event_create(struct intr_event **event, void *source,
-	    int flags, void (*pre_ithread)(void *),
+	    int flags, int irq, void (*pre_ithread)(void *),
 	    void (*post_ithread)(void *), void (*post_filter)(void *),
 	    int (*assign_cpu)(void *, u_char), const char *fmt, ...)
-	    __printflike(8, 9);
+	    __printflike(9, 10);
 int	intr_event_destroy(struct intr_event *ie);
 int	intr_event_handle(struct intr_event *ie, struct trapframe *frame);
 int	intr_event_remove_handler(void *cookie);
+int	intr_getaffinity(int irq, void *mask);
 void	*intr_handler_source(void *cookie);
+int	intr_setaffinity(int irq, void *mask);
 int	swi_add(struct intr_event **eventp, const char *name,
 	    driver_intr_t handler, void *arg, int pri, enum intr_type flags,
 	    void **cookiep);

Modified: stable/7/usr.bin/cpuset/cpuset.1
==============================================================================
--- stable/7/usr.bin/cpuset/cpuset.1	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/usr.bin/cpuset/cpuset.1	Tue May 19 22:07:54 2009	(r192409)
@@ -35,7 +35,7 @@
 .Nm
 .Op Fl l Ar cpu-list
 .Op Fl s Ar setid
-.Ar cmd
+.Ar cmd ...
 .Nm
 .Op Fl l Ar cpu-list
 .Op Fl s Ar setid
@@ -43,10 +43,10 @@
 .Nm
 .Op Fl cr
 .Op Fl l Ar cpu-list
-.Op Fl j Ar jailid | Fl p Ar pid | Fl r Ar tid | Fl s Ar setid | Fl x Ar irq
+.Op Fl j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
 .Nm
 .Op Fl cgir
-.Op Fl j Ar jailid | Fl p Ar pid | Fl r Ar tid | Fl s Ar setid | Fl x Ar irq
+.Op Fl j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
 .Sh DESCRIPTION
 The
 .Nm
@@ -104,7 +104,7 @@ target specifier.
 .It Fl g
 Causes
 .Nm
-to print either a list of valid CPUs or, using 
+to print either a list of valid CPUs or, using
 .Fl i ,
 the id of the target.
 .It Fl i
@@ -116,17 +116,17 @@ Specifies a jail id as the target of the
 .It Fl l Ar cpu-list
 Specifies a list of CPUs to apply to a target.
 Specification may include
-numbers seperated by '-' for ranges and commas separating individual numbers.
+numbers separated by '-' for ranges and commas separating individual numbers.
 .It Fl p Ar pid
 Specifies a pid as the target of the operation.
-.It Fl s Ar setid 
+.It Fl s Ar setid
 Specifies a set id as the target of the operation.
 .It Fl r
 The requested operation should reference the root set available via the
 target specifier.
 .It Fl t Ar tid
 Specifies a thread id as the target of the operation.
-.It Fl x Ar irq 
+.It Fl x Ar irq
 Specifies an irq as the target of the operation.
 .El
 .Sh EXIT STATUS

Modified: stable/7/usr.bin/cpuset/cpuset.c
==============================================================================
--- stable/7/usr.bin/cpuset/cpuset.c	Tue May 19 20:23:32 2009	(r192408)
+++ stable/7/usr.bin/cpuset/cpuset.c	Tue May 19 22:07:54 2009	(r192409)
@@ -2,6 +2,9 @@
  * Copyright (c) 2007, 2008 	Jeffrey Roberson 
  * All rights reserved.
  *
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -52,6 +55,7 @@ int pflag;
 int rflag;
 int sflag;
 int tflag;
+int xflag;
 id_t id;
 cpulevel_t level;
 cpuwhich_t which;
@@ -150,7 +154,7 @@ printset(cpuset_t *mask)
 	printf("\n");
 }
 
-const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "N/A", "jail" };
+const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "irq", "jail" };
 const char *levelnames[] = { NULL, " root", " cpuset", "" };
 
 static void
@@ -195,7 +199,7 @@ main(int argc, char *argv[])
 	level = CPU_LEVEL_WHICH;
 	which = CPU_WHICH_PID;
 	id = pid = tid = setid = -1;
-	while ((ch = getopt(argc, argv, "cgij:l:p:rs:t:")) != -1) {
+	while ((ch = getopt(argc, argv, "cgij:l:p:rs:t:x:")) != -1) {
 		switch (ch) {
 		case 'c':
 			if (rflag)
@@ -239,6 +243,11 @@ main(int argc, char *argv[])
 			which = CPU_WHICH_TID;
 			id = tid = atoi(optarg);
 			break;
+		case 'x':
+			xflag = 1;
+			which = CPU_WHICH_IRQ;
+			id = atoi(optarg);
+			break;
 		default:
 			usage();
 		}
@@ -249,7 +258,7 @@ main(int argc, char *argv[])
 		if (argc || lflag)
 			usage();
 		/* Only one identity specifier. */
-		if (jflag + sflag + pflag + tflag > 1)
+		if (jflag + xflag + sflag + pflag + tflag > 1)
 			usage();
 		if (iflag)
 			printsetid();
@@ -263,7 +272,7 @@ main(int argc, char *argv[])
 	 * The user wants to run a command with a set and possibly cpumask.
 	 */
 	if (argc) {
-		if (pflag | rflag | tflag | jflag)
+		if (pflag | rflag | tflag | xflag | jflag)
 			usage();
 		if (sflag) {
 			if (cpuset_setid(CPU_WHICH_PID, -1, setid))
@@ -289,7 +298,10 @@ main(int argc, char *argv[])
 	if (!lflag && !sflag)
 		usage();
 	/* You can only set a mask on a thread. */
-	if (tflag && (sflag | pflag | jflag))
+	if (tflag && (sflag | pflag | xflag | jflag))
+		usage();
+	/* You can only set a mask on an irq. */
+	if (xflag && (jflag | pflag | sflag | tflag))
 		usage();
 	if (pflag && sflag) {
 		if (cpuset_setid(CPU_WHICH_PID, pid, setid))
@@ -319,8 +331,8 @@ usage(void)
 	fprintf(stderr,
 	    "       cpuset [-l cpu-list] [-s setid] -p pid\n");
 	fprintf(stderr,
-	    "       cpuset [-cr] [-l cpu-list] [-j jailid | -p pid | -t tid | -s setid]\n");
+	    "       cpuset [-cr] [-l cpu-list] [-j jailid | -p pid | -t tid | -s setid | -x irq]\n");
 	fprintf(stderr,
-	    "       cpuset [-cgir] [-j jailid | -p pid | -t tid | -s setid]\n");
+	    "       cpuset [-cgir] [-j jailid | -p pid | -t tid | -s setid | -x irq]\n");
 	exit(1);
 }
From hrs at FreeBSD.org  Wed May 20 00:55:29 2009
From: hrs at FreeBSD.org (Hiroki Sato)
Date: Wed May 20 00:55:46 2009
Subject: svn commit: r192411 - stable/7/release/doc/en_US.ISO8859-1/errata
Message-ID: <200905200055.n4K0tQBK014328@svn.freebsd.org>

Author: hrs
Date: Wed May 20 00:55:26 2009
New Revision: 192411
URL: http://svn.freebsd.org/changeset/base/192411

Log:
  Document fxp(4) TSO issue on 7.2R.
  
  Submitted by:	delphij

Modified:
  stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml

Modified: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml
==============================================================================
--- stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml	Tue May 19 22:28:33 2009	(r192410)
+++ stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml	Wed May 20 00:55:26 2009	(r192411)
@@ -183,6 +183,15 @@
       Errata Notice to fix this problem is planned after the
       release.
 
+    [20090507] A bug was found in the &man.fxp.4; driver.  This
+      would cause poor TCP performance when TSO is enabled, and the
+      receiver has a smaller MSS than the interface MTU setting.  To
+      workaround this issue, one can disable TSO by using
+      &man.ifconfig.8;  parameter (per interface
+      basis) or setting net.inet.tcp.tso to
+      0 (globally on the system).  An Errata Notice
+      to fix this problem is planned after the release.
+
   
     Late-Breaking News and Corrections
 
@@ -190,5 +199,10 @@
       &man.malloc.3; implementation and threading library has been
       committed to the RELENG_7 branch for public
       testing.
+
+    [20090507] A patch to solve the bug in the &man.fxp.4;
+      driver that caused poor TCP performance has been committed to
+      the RELENG_7 branch for public
+      testing.
   
 
From yongari at FreeBSD.org  Wed May 20 02:13:02 2009
From: yongari at FreeBSD.org (Pyun YongHyeon)
Date: Wed May 20 02:13:13 2009
Subject: svn commit: r192412 - in stable/7/sys: . contrib/pf dev/age
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905200213.n4K2D2V1015873@svn.freebsd.org>

Author: yongari
Date: Wed May 20 02:13:01 2009
New Revision: 192412
URL: http://svn.freebsd.org/changeset/base/192412

Log:
  MFC r190303:
    Fix inversed logic. pci_find_extcap() returns 0 when it finds
    specified capability.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/age/if_age.c
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/age/if_age.c
==============================================================================
--- stable/7/sys/dev/age/if_age.c	Wed May 20 00:55:26 2009	(r192411)
+++ stable/7/sys/dev/age/if_age.c	Wed May 20 02:13:01 2009	(r192412)
@@ -1369,7 +1369,7 @@ age_setwol(struct age_softc *sc)
 
 	AGE_LOCK_ASSERT(sc);
 
-	if (pci_find_extcap(sc->age_dev, PCIY_PMG, &pmc) == 0) {
+	if (pci_find_extcap(sc->age_dev, PCIY_PMG, &pmc) != 0) {
 		CSR_WRITE_4(sc, AGE_WOL_CFG, 0);
 		/*
 		 * No PME capability, PHY power down.
From yongari at FreeBSD.org  Wed May 20 02:18:28 2009
From: yongari at FreeBSD.org (Pyun YongHyeon)
Date: Wed May 20 02:18:47 2009
Subject: svn commit: r192413 - in stable/7/sys: . contrib/pf dev/age
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905200218.n4K2IQZ3016008@svn.freebsd.org>

Author: yongari
Date: Wed May 20 02:18:26 2009
New Revision: 192413
URL: http://svn.freebsd.org/changeset/base/192413

Log:
  MFC r190499:
    o Don't access VPD even if hardware advertised the capability.
      It seems that some revision of controller hang while accessing
      the VPD. Because VPD access routine are unused, nuke it.
    o Let TWSI reload EEPROM if VPD capability is detected. Reloading
      EEPROM will also set ethernet address so age(4) now reads AGE_PAR0
      and AGE_PAR1 register to get ethernet address. This removes a lot
      of hack and enhance readability a lot.
    o Double PHY reset timeout as it takes more time to take PHY out of
      power-saving state.
    o Explicitly check power-saving state by checking undocumented PHY
      registers. If link is not up, poke undocumented registers to take
      PHY out of power-saving state. This is the same way what Linux
      does. On resume, make sure to wake up PHY.
    o Don't rely on auto-clearing feature of master reset bit, just wait
      1ms and check idle status of MAC.
    o Add PCI device revision information in bootverbose mode.
    This should fix occasional controller hang in device attach phase.
  
    Reported by:	barbara < barbara.xxx1975 at libero DOT it >
    Tested by:	barbara < barbara.xxx1975 at libero DOT it >

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/age/if_age.c
  stable/7/sys/dev/age/if_agereg.h
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/age/if_age.c
==============================================================================
--- stable/7/sys/dev/age/if_age.c	Wed May 20 02:13:01 2009	(r192412)
+++ stable/7/sys/dev/age/if_age.c	Wed May 20 02:18:26 2009	(r192413)
@@ -106,8 +106,6 @@ static int age_miibus_writereg(device_t,
 static void age_miibus_statchg(device_t);
 static void age_mediastatus(struct ifnet *, struct ifmediareq *);
 static int age_mediachange(struct ifnet *);
-static int age_read_vpd_word(struct age_softc *, uint32_t, uint32_t,
-    uint32_t *);
 static int age_probe(device_t);
 static void age_get_macaddr(struct age_softc *);
 static void age_phy_reset(struct age_softc *);
@@ -321,29 +319,6 @@ age_mediachange(struct ifnet *ifp)
 }
 
 static int
-age_read_vpd_word(struct age_softc *sc, uint32_t vpdc, uint32_t offset,
-    uint32_t *word)
-{
-	int i;
-
-	pci_write_config(sc->age_dev, vpdc + PCIR_VPD_ADDR, offset, 2);
-	for (i = AGE_TIMEOUT; i > 0; i--) {
-		DELAY(10);
-		if ((pci_read_config(sc->age_dev, vpdc + PCIR_VPD_ADDR, 2) &
-		    0x8000) == 0x8000)
-			break;
-	}
-	if (i == 0) {
-		device_printf(sc->age_dev, "VPD read timeout!\n");
-		*word = 0;
-		return (ETIMEDOUT);
-	}
-
-	*word = pci_read_config(sc->age_dev, vpdc + PCIR_VPD_DATA, 4);
-	return (0);
-}
-
-static int
 age_probe(device_t dev)
 {
 	struct age_dev *sp;
@@ -368,8 +343,8 @@ age_probe(device_t dev)
 static void
 age_get_macaddr(struct age_softc *sc)
 {
-	uint32_t ea[2], off, reg, word;
-	int vpd_error, match, vpdc;
+	uint32_t ea[2], reg;
+	int i, vpdc;
 
 	reg = CSR_READ_4(sc, AGE_SPI_CTRL);
 	if ((reg & SPI_VPD_ENB) != 0) {
@@ -378,123 +353,114 @@ age_get_macaddr(struct age_softc *sc)
 		CSR_WRITE_4(sc, AGE_SPI_CTRL, reg);
 	}
 
-	vpd_error = 0;
-	ea[0] = ea[1] = 0;
-	if ((vpd_error = pci_find_extcap(sc->age_dev, PCIY_VPD, &vpdc)) == 0) {
+	if (pci_find_extcap(sc->age_dev, PCIY_VPD, &vpdc) == 0) {
 		/*
-		 * PCI VPD capability exists, but it seems that it's
-		 * not in the standard form as stated in PCI VPD
-		 * specification such that driver could not use
-		 * pci_get_vpd_readonly(9) with keyword 'NA'.
-		 * Search VPD data starting at address 0x0100. The data
-		 * should be used as initializers to set AGE_PAR0,
-		 * AGE_PAR1 register including other PCI configuration
-		 * registers.
+		 * PCI VPD capability found, let TWSI reload EEPROM.
+		 * This will set ethernet address of controller.
 		 */
-		word = 0;
-		match = 0;
-		reg = 0;
-		for (off = AGE_VPD_REG_CONF_START; off < AGE_VPD_REG_CONF_END;
-		    off += sizeof(uint32_t)) {
-			vpd_error = age_read_vpd_word(sc, vpdc, off, &word);
-			if (vpd_error != 0)
-				break;
-			if (match != 0) {
-				switch (reg) {
-				case AGE_PAR0:
-					ea[0] = word;
-					break;
-				case AGE_PAR1:
-					ea[1] = word;
-					break;
-				default:
-					break;
-				}
-				match = 0;
-			} else if ((word & 0xFF) == AGE_VPD_REG_CONF_SIG) {
-				match = 1;
-				reg = word >> 16;
-			} else
+		CSR_WRITE_4(sc, AGE_TWSI_CTRL, CSR_READ_4(sc, AGE_TWSI_CTRL) |
+		    TWSI_CTRL_SW_LD_START);
+		for (i = 100; i > 0; i--) {
+			DELAY(1000);
+			reg = CSR_READ_4(sc, AGE_TWSI_CTRL);
+			if ((reg & TWSI_CTRL_SW_LD_START) == 0)
 				break;
 		}
-		if (off >= AGE_VPD_REG_CONF_END)
-			vpd_error = ENOENT;
-		if (vpd_error == 0) {
-			/*
-			 * Don't blindly trust ethernet address obtained
-			 * from VPD. Check whether ethernet address is
-			 * valid one. Otherwise fall-back to reading
-			 * PAR register.
-			 */
-			ea[1] &= 0xFFFF;
-			if ((ea[0] == 0 && ea[1] == 0) ||
-			    (ea[0] == 0xFFFFFFFF && ea[1] == 0xFFFF)) {
-				if (bootverbose)
-					device_printf(sc->age_dev,
-					    "invalid ethernet address "
-					    "returned from VPD.\n");
-				vpd_error = EINVAL;
-			}
-		}
-		if (vpd_error != 0 && (bootverbose))
-			device_printf(sc->age_dev, "VPD access failure!\n");
+		if (i == 0)
+			device_printf(sc->age_dev,
+			    "reloading EEPROM timeout!\n");
 	} else {
 		if (bootverbose)
 			device_printf(sc->age_dev,
 			    "PCI VPD capability not found!\n");
 	}
 
-	/*
-	 * It seems that L1 also provides a way to extract ethernet
-	 * address via SPI flash interface. Because SPI flash memory
-	 * device of different vendors vary in their instruction
-	 * codes for read ID instruction, it's very hard to get
-	 * instructions codes without detailed information for the
-	 * flash memory device used on ethernet controller. To simplify
-	 * code, just read AGE_PAR0/AGE_PAR1 register to get ethernet
-	 * address which is supposed to be set by hardware during
-	 * power on reset.
-	 */
-	if (vpd_error != 0) {
-		/*
-		 * VPD is mapped to SPI flash memory or BIOS set it.
-		 */
-		ea[0] = CSR_READ_4(sc, AGE_PAR0);
-		ea[1] = CSR_READ_4(sc, AGE_PAR1);
-	}
-
-	ea[1] &= 0xFFFF;
-	if ((ea[0] == 0 && ea[1]  == 0) ||
-	    (ea[0] == 0xFFFFFFFF && ea[1] == 0xFFFF)) {
-		device_printf(sc->age_dev,
-		    "generating fake ethernet address.\n");
-		ea[0] = arc4random();
-		/* Set OUI to ASUSTek COMPUTER INC. */
-		sc->age_eaddr[0] = 0x00;
-		sc->age_eaddr[1] = 0x1B;
-		sc->age_eaddr[2] = 0xFC;
-		sc->age_eaddr[3] = (ea[0] >> 16) & 0xFF;
-		sc->age_eaddr[4] = (ea[0] >> 8) & 0xFF;
-		sc->age_eaddr[5] = (ea[0] >> 0) & 0xFF;
-	} else {
-		sc->age_eaddr[0] = (ea[1] >> 8) & 0xFF;
-		sc->age_eaddr[1] = (ea[1] >> 0) & 0xFF;
-		sc->age_eaddr[2] = (ea[0] >> 24) & 0xFF;
-		sc->age_eaddr[3] = (ea[0] >> 16) & 0xFF;
-		sc->age_eaddr[4] = (ea[0] >> 8) & 0xFF;
-		sc->age_eaddr[5] = (ea[0] >> 0) & 0xFF;
-	}
+	ea[0] = CSR_READ_4(sc, AGE_PAR0);
+	ea[1] = CSR_READ_4(sc, AGE_PAR1);
+	sc->age_eaddr[0] = (ea[1] >> 8) & 0xFF;
+	sc->age_eaddr[1] = (ea[1] >> 0) & 0xFF;
+	sc->age_eaddr[2] = (ea[0] >> 24) & 0xFF;
+	sc->age_eaddr[3] = (ea[0] >> 16) & 0xFF;
+	sc->age_eaddr[4] = (ea[0] >> 8) & 0xFF;
+	sc->age_eaddr[5] = (ea[0] >> 0) & 0xFF;
 }
 
 static void
 age_phy_reset(struct age_softc *sc)
 {
+	uint16_t reg, pn;
+	int i, linkup;
 
 	/* Reset PHY. */
 	CSR_WRITE_4(sc, AGE_GPHY_CTRL, GPHY_CTRL_RST);
-	DELAY(1000);
+	DELAY(2000);
 	CSR_WRITE_4(sc, AGE_GPHY_CTRL, GPHY_CTRL_CLR);
-	DELAY(1000);
+	DELAY(2000);
+
+#define	ATPHY_DBG_ADDR		0x1D
+#define	ATPHY_DBG_DATA		0x1E
+#define	ATPHY_CDTC		0x16
+#define	PHY_CDTC_ENB		0x0001
+#define	PHY_CDTC_POFF		8
+#define	ATPHY_CDTS		0x1C
+#define	PHY_CDTS_STAT_OK	0x0000
+#define	PHY_CDTS_STAT_SHORT	0x0100
+#define	PHY_CDTS_STAT_OPEN	0x0200
+#define	PHY_CDTS_STAT_INVAL	0x0300
+#define	PHY_CDTS_STAT_MASK	0x0300
+
+	/* Check power saving mode. Magic from Linux. */
+	age_miibus_writereg(sc->age_dev, sc->age_phyaddr, MII_BMCR, BMCR_RESET);
+	for (linkup = 0, pn = 0; pn < 4; pn++) {
+		age_miibus_writereg(sc->age_dev, sc->age_phyaddr, ATPHY_CDTC,
+		    (pn << PHY_CDTC_POFF) | PHY_CDTC_ENB);
+		for (i = 200; i > 0; i--) {
+			DELAY(1000);
+			reg = age_miibus_readreg(sc->age_dev, sc->age_phyaddr,
+			    ATPHY_CDTC);
+			if ((reg & PHY_CDTC_ENB) == 0)
+				break;
+		}
+		DELAY(1000);
+		reg = age_miibus_readreg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_CDTS);
+		if ((reg & PHY_CDTS_STAT_MASK) != PHY_CDTS_STAT_OPEN) {
+			linkup++;
+			break;
+		}
+	}
+	age_miibus_writereg(sc->age_dev, sc->age_phyaddr, MII_BMCR,
+	    BMCR_RESET | BMCR_AUTOEN | BMCR_STARTNEG);
+	if (linkup == 0) {
+		age_miibus_writereg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_DBG_ADDR, 0);
+		age_miibus_writereg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_DBG_DATA, 0x124E);
+		age_miibus_writereg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_DBG_ADDR, 1);
+		reg = age_miibus_readreg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_DBG_DATA);
+		age_miibus_writereg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_DBG_DATA, reg | 0x03);
+		/* XXX */
+		DELAY(1500 * 1000);
+		age_miibus_writereg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_DBG_ADDR, 0);
+		age_miibus_writereg(sc->age_dev, sc->age_phyaddr,
+		    ATPHY_DBG_DATA, 0x024E);
+    }
+
+#undef	ATPHY_DBG_ADDR
+#undef	ATPHY_DBG_DATA
+#undef	ATPHY_CDTC
+#undef	PHY_CDTC_ENB
+#undef	PHY_CDTC_POFF
+#undef	ATPHY_CDTS
+#undef	PHY_CDTS_STAT_OK
+#undef	PHY_CDTS_STAT_SHORT
+#undef	PHY_CDTS_STAT_OPEN
+#undef	PHY_CDTS_STAT_INVAL
+#undef	PHY_CDTS_STAT_MASK
 }
 
 static int
@@ -539,7 +505,8 @@ age_attach(device_t dev)
 	sc->age_chip_rev = CSR_READ_4(sc, AGE_MASTER_CFG) >>
 	    MASTER_CHIP_REV_SHIFT;
 	if (bootverbose) {
-		device_printf(dev, "PCI device revision : 0x%04x\n", sc->age_rev);
+		device_printf(dev, "PCI device revision : 0x%04x\n",
+		    sc->age_rev);
 		device_printf(dev, "Chip id/revision : 0x%04x\n",
 		    sc->age_chip_rev);
 	}
@@ -1524,6 +1491,9 @@ age_resume(device_t dev)
 		cmd &= ~0x0400;
 		pci_write_config(sc->age_dev, PCIR_COMMAND, cmd, 2);
 	}
+	AGE_UNLOCK(sc);
+	age_phy_reset(sc);
+	AGE_LOCK(sc);
 	ifp = sc->age_ifp;
 	if ((ifp->if_flags & IFF_UP) != 0)
 		age_init_locked(sc);
@@ -2544,14 +2514,8 @@ age_reset(struct age_softc *sc)
 	int i;
 
 	CSR_WRITE_4(sc, AGE_MASTER_CFG, MASTER_RESET);
-	for (i = AGE_RESET_TIMEOUT; i > 0; i--) {
-		DELAY(1);
-		if ((CSR_READ_4(sc, AGE_MASTER_CFG) & MASTER_RESET) == 0)
-			break;
-	}
-	if (i == 0)
-		device_printf(sc->age_dev, "master reset timeout!\n");
-
+	CSR_READ_4(sc, AGE_MASTER_CFG);
+	DELAY(1000);
 	for (i = AGE_RESET_TIMEOUT; i > 0; i--) {
 		if ((reg = CSR_READ_4(sc, AGE_IDLE_STATUS)) == 0)
 			break;

Modified: stable/7/sys/dev/age/if_agereg.h
==============================================================================
--- stable/7/sys/dev/age/if_agereg.h	Wed May 20 02:13:01 2009	(r192412)
+++ stable/7/sys/dev/age/if_agereg.h	Wed May 20 02:18:26 2009	(r192413)
@@ -91,6 +91,9 @@
 #define	AGE_SPI_OP_READ			0x217	/* 8bits */
 
 #define	AGE_TWSI_CTRL			0x218
+#define	TWSI_CTRL_SW_LD_START		0x00000800
+#define	TWSI_CTRL_HW_LD_START		0x00001000
+#define	TWSI_CTRL_LD_EXIST		0x00400000
 
 #define AGE_DEV_MISC_CTRL		0x21C
 
From yongari at FreeBSD.org  Wed May 20 02:24:10 2009
From: yongari at FreeBSD.org (Pyun YongHyeon)
Date: Wed May 20 02:24:28 2009
Subject: svn commit: r192414 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/sk
Message-ID: <200905200224.n4K2O9LQ016223@svn.freebsd.org>

Author: yongari
Date: Wed May 20 02:24:09 2009
New Revision: 192414
URL: http://svn.freebsd.org/changeset/base/192414

Log:
  MFC r191716:
    Separate multicast filtering of SysKonnect GENESIS and Marvell
    Yukon from common multicast handling code. Yukon uses hash-based
    multicast filtering(big endian form) but GENESIS uses perfect
    multicast filtering as well as hash-based one(little endian form).
    Due to the differences of multicast filtering there is no much
    sense to have a common code.
     o Remove sk_setmulti() and introduce sk_rxfilter_yukon(),
       sk_rxfilter_yukon() that handles multicast filtering setup.
     o Have sk_rxfilter_{yukon, genesis} handle promiscuous mode and
       nuke sk_setpromisc(). This simplifies ioctl handler as well as
       giving a chance to check validity of Rx control register of
       Yukon.
     o Don't reinitialize controller when IFF_ALLMULTI flags is changed.
     o Nuke sk_gmchash(), it's not needed anymore.
     o Always reconfigure Rx control register whenever a new multicast
       filtering condition is changed. This fixes multicast filtering
       setup on Yukon.
  
    PR:	kern/134051

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/sk/if_sk.c

Modified: stable/7/sys/dev/sk/if_sk.c
==============================================================================
--- stable/7/sys/dev/sk/if_sk.c	Wed May 20 02:18:26 2009	(r192413)
+++ stable/7/sys/dev/sk/if_sk.c	Wed May 20 02:24:09 2009	(r192414)
@@ -255,10 +255,10 @@ static int sk_marv_miibus_writereg(struc
 static void sk_marv_miibus_statchg(struct sk_if_softc *);
 
 static uint32_t sk_xmchash(const uint8_t *);
-static uint32_t sk_gmchash(const uint8_t *);
 static void sk_setfilt(struct sk_if_softc *, u_int16_t *, int);
-static void sk_setmulti(struct sk_if_softc *);
-static void sk_setpromisc(struct sk_if_softc *);
+static void sk_rxfilter(struct sk_if_softc *);
+static void sk_rxfilter_genesis(struct sk_if_softc *);
+static void sk_rxfilter_yukon(struct sk_if_softc *);
 
 static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int low, int high);
 static int sysctl_hw_sk_int_mod(SYSCTL_HANDLER_ARGS);
@@ -697,19 +697,6 @@ sk_xmchash(addr)
 	return (~crc & ((1 << HASH_BITS) - 1));
 }
 
-/* gmchash is just a big endian crc */
-static u_int32_t
-sk_gmchash(addr)
-	const uint8_t *addr;
-{
-	uint32_t crc;
-
-	/* Compute CRC for the address value. */
-	crc = ether_crc32_be(addr, ETHER_ADDR_LEN);
-
-	return (crc & ((1 << HASH_BITS) - 1));
-}
-
 static void
 sk_setfilt(sc_if, addr, slot)
 	struct sk_if_softc	*sc_if;
@@ -728,12 +715,26 @@ sk_setfilt(sc_if, addr, slot)
 }
 
 static void
-sk_setmulti(sc_if)
+sk_rxfilter(sc_if)
+	struct sk_if_softc	*sc_if;
+{
+	struct sk_softc		*sc;
+
+	SK_IF_LOCK_ASSERT(sc_if);
+
+	sc = sc_if->sk_softc;
+	if (sc->sk_type == SK_GENESIS)
+		sk_rxfilter_genesis(sc_if);
+	else
+		sk_rxfilter_yukon(sc_if);
+}
+
+static void
+sk_rxfilter_genesis(sc_if)
 	struct sk_if_softc	*sc_if;
 {
-	struct sk_softc		*sc = sc_if->sk_softc;
 	struct ifnet		*ifp = sc_if->sk_ifp;
-	u_int32_t		hashes[2] = { 0, 0 };
+	u_int32_t		hashes[2] = { 0, 0 }, mode;
 	int			h = 0, i;
 	struct ifmultiaddr	*ifma;
 	u_int16_t		dummy[] = { 0, 0, 0 };
@@ -741,124 +742,96 @@ sk_setmulti(sc_if)
 
 	SK_IF_LOCK_ASSERT(sc_if);
 
-	/* First, zot all the existing filters. */
-	switch(sc->sk_type) {
-	case SK_GENESIS:
-		for (i = 1; i < XM_RXFILT_MAX; i++)
-			sk_setfilt(sc_if, dummy, i);
-
-		SK_XM_WRITE_4(sc_if, XM_MAR0, 0);
-		SK_XM_WRITE_4(sc_if, XM_MAR2, 0);
-		break;
-	case SK_YUKON:
-	case SK_YUKON_LITE:
-	case SK_YUKON_LP:
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH1, 0);
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH2, 0);
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH3, 0);
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH4, 0);
-		break;
-	}
+	mode = SK_XM_READ_4(sc_if, XM_MODE);
+	mode &= ~(XM_MODE_RX_PROMISC | XM_MODE_RX_USE_HASH |
+	    XM_MODE_RX_USE_PERFECT);
+	/* First, zot all the existing perfect filters. */
+	for (i = 1; i < XM_RXFILT_MAX; i++)
+		sk_setfilt(sc_if, dummy, i);
 
 	/* Now program new ones. */
 	if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {
+		if (ifp->if_flags & IFF_ALLMULTI)
+			mode |= XM_MODE_RX_USE_HASH;
+		if (ifp->if_flags & IFF_PROMISC)
+			mode |= XM_MODE_RX_PROMISC;
 		hashes[0] = 0xFFFFFFFF;
 		hashes[1] = 0xFFFFFFFF;
 	} else {
 		i = 1;
 		IF_ADDR_LOCK(ifp);
-		TAILQ_FOREACH_REVERSE(ifma, &ifp->if_multiaddrs, ifmultihead, ifma_link) {
+		TAILQ_FOREACH_REVERSE(ifma, &ifp->if_multiaddrs, ifmultihead,
+		    ifma_link) {
 			if (ifma->ifma_addr->sa_family != AF_LINK)
 				continue;
 			/*
 			 * Program the first XM_RXFILT_MAX multicast groups
-			 * into the perfect filter. For all others,
-			 * use the hash table.
+			 * into the perfect filter.
 			 */
-			if (sc->sk_type == SK_GENESIS && i < XM_RXFILT_MAX) {
-				bcopy(LLADDR(
-				    (struct sockaddr_dl *)ifma->ifma_addr),
-				    maddr, ETHER_ADDR_LEN);
+			bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
+			    maddr, ETHER_ADDR_LEN);
+			if (i < XM_RXFILT_MAX) {
 				sk_setfilt(sc_if, maddr, i);
+				mode |= XM_MODE_RX_USE_PERFECT;
 				i++;
 				continue;
 			}
-
-			switch(sc->sk_type) {
-			case SK_GENESIS:
-				bcopy(LLADDR(
-				    (struct sockaddr_dl *)ifma->ifma_addr),
-				    maddr, ETHER_ADDR_LEN);
-				h = sk_xmchash((const uint8_t *)maddr);
-				break;
-			case SK_YUKON:
-			case SK_YUKON_LITE:
-			case SK_YUKON_LP:
-				bcopy(LLADDR(
-				    (struct sockaddr_dl *)ifma->ifma_addr),
-				    maddr, ETHER_ADDR_LEN);
-				h = sk_gmchash((const uint8_t *)maddr);
-				break;
-			}
+			h = sk_xmchash((const uint8_t *)maddr);
 			if (h < 32)
 				hashes[0] |= (1 << h);
 			else
 				hashes[1] |= (1 << (h - 32));
+			mode |= XM_MODE_RX_USE_HASH;
 		}
 		IF_ADDR_UNLOCK(ifp);
 	}
 
-	switch(sc->sk_type) {
-	case SK_GENESIS:
-		SK_XM_SETBIT_4(sc_if, XM_MODE, XM_MODE_RX_USE_HASH|
-			       XM_MODE_RX_USE_PERFECT);
-		SK_XM_WRITE_4(sc_if, XM_MAR0, hashes[0]);
-		SK_XM_WRITE_4(sc_if, XM_MAR2, hashes[1]);
-		break;
-	case SK_YUKON:
-	case SK_YUKON_LITE:
-	case SK_YUKON_LP:
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH1, hashes[0] & 0xffff);
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH2, (hashes[0] >> 16) & 0xffff);
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH3, hashes[1] & 0xffff);
-		SK_YU_WRITE_2(sc_if, YUKON_MCAH4, (hashes[1] >> 16) & 0xffff);
-		break;
-	}
-
-	return;
+	SK_XM_WRITE_4(sc_if, XM_MODE, mode);
+	SK_XM_WRITE_4(sc_if, XM_MAR0, hashes[0]);
+	SK_XM_WRITE_4(sc_if, XM_MAR2, hashes[1]);
 }
 
 static void
-sk_setpromisc(sc_if)
+sk_rxfilter_yukon(sc_if)
 	struct sk_if_softc	*sc_if;
 {
-	struct sk_softc		*sc = sc_if->sk_softc;
-	struct ifnet		*ifp = sc_if->sk_ifp;
+	struct ifnet		*ifp;
+	u_int32_t		crc, hashes[2] = { 0, 0 }, mode;
+	struct ifmultiaddr	*ifma;
 
 	SK_IF_LOCK_ASSERT(sc_if);
 
-	switch(sc->sk_type) {
-	case SK_GENESIS:
-		if (ifp->if_flags & IFF_PROMISC) {
-			SK_XM_SETBIT_4(sc_if, XM_MODE, XM_MODE_RX_PROMISC);
-		} else {
-			SK_XM_CLRBIT_4(sc_if, XM_MODE, XM_MODE_RX_PROMISC);
-		}
-		break;
-	case SK_YUKON:
-	case SK_YUKON_LITE:
-	case SK_YUKON_LP:
-		if (ifp->if_flags & IFF_PROMISC) {
-			SK_YU_CLRBIT_2(sc_if, YUKON_RCR,
-			    YU_RCR_UFLEN | YU_RCR_MUFLEN);
-		} else {
-			SK_YU_SETBIT_2(sc_if, YUKON_RCR,
-			    YU_RCR_UFLEN | YU_RCR_MUFLEN);
+	ifp = sc_if->sk_ifp;
+	mode = SK_YU_READ_2(sc_if, YUKON_RCR);
+	if (ifp->if_flags & IFF_PROMISC)
+		mode &= ~(YU_RCR_UFLEN | YU_RCR_MUFLEN); 
+	else if (ifp->if_flags & IFF_ALLMULTI) {
+		mode |= YU_RCR_UFLEN | YU_RCR_MUFLEN; 
+		hashes[0] = 0xFFFFFFFF;
+		hashes[1] = 0xFFFFFFFF;
+	} else {
+		mode |= YU_RCR_UFLEN;
+		IF_ADDR_LOCK(ifp);
+		TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
+			if (ifma->ifma_addr->sa_family != AF_LINK)
+				continue;
+			crc = ether_crc32_be(LLADDR((struct sockaddr_dl *)
+			    ifma->ifma_addr), ETHER_ADDR_LEN);
+			/* Just want the 6 least significant bits. */
+			crc &= 0x3f;
+			/* Set the corresponding bit in the hash table. */
+			hashes[crc >> 5] |= 1 << (crc & 0x1f);
 		}
-		break;
+		IF_ADDR_UNLOCK(ifp);
+		if (hashes[0] != 0 || hashes[1] != 0)
+			mode |= YU_RCR_MUFLEN;
 	}
 
-	return;
+	SK_YU_WRITE_2(sc_if, YUKON_MCAH1, hashes[0] & 0xffff);
+	SK_YU_WRITE_2(sc_if, YUKON_MCAH2, (hashes[0] >> 16) & 0xffff);
+	SK_YU_WRITE_2(sc_if, YUKON_MCAH3, hashes[1] & 0xffff);
+	SK_YU_WRITE_2(sc_if, YUKON_MCAH4, (hashes[1] >> 16) & 0xffff);
+	SK_YU_WRITE_2(sc_if, YUKON_RCR, mode);
 }
 
 static int
@@ -1166,10 +1139,8 @@ sk_ioctl(ifp, command, data)
 		if (ifp->if_flags & IFF_UP) {
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 				if ((ifp->if_flags ^ sc_if->sk_if_flags)
-				    & IFF_PROMISC) {
-					sk_setpromisc(sc_if);
-					sk_setmulti(sc_if);
-				}
+				    & (IFF_PROMISC | IFF_ALLMULTI))
+					sk_rxfilter(sc_if);
 			} else
 				sk_init_locked(sc_if);
 		} else {
@@ -1183,7 +1154,7 @@ sk_ioctl(ifp, command, data)
 	case SIOCDELMULTI:
 		SK_IF_LOCK(sc_if);
 		if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-			sk_setmulti(sc_if);
+			sk_rxfilter(sc_if);
 		SK_IF_UNLOCK(sc_if);
 		break;
 	case SIOCGIFMEDIA:
@@ -3302,11 +3273,8 @@ sk_init_xmac(sc_if)
 	 */
 	SK_XM_WRITE_2(sc_if, XM_TX_REQTHRESH, SK_XM_TX_FIFOTHRESH);
 
-	/* Set promiscuous mode */
-	sk_setpromisc(sc_if);
-
-	/* Set multicast filter */
-	sk_setmulti(sc_if);
+	/* Set Rx filter */
+	sk_rxfilter_genesis(sc_if);
 
 	/* Clear and enable interrupts */
 	SK_XM_READ_2(sc_if, XM_ISR);
@@ -3447,11 +3415,8 @@ sk_init_yukon(sc_if)
 		SK_YU_WRITE_2(sc_if, YUKON_SAL2 + i * 4, reg);
 	}
 
-	/* Set promiscuous mode */
-	sk_setpromisc(sc_if);
-
-	/* Set multicast filter */
-	sk_setmulti(sc_if);
+	/* Set Rx filter */
+	sk_rxfilter_yukon(sc_if);
 
 	/* enable interrupt mask for counter overflows */
 	SK_YU_WRITE_2(sc_if, YUKON_TIMR, 0);
From mav at FreeBSD.org  Wed May 20 02:48:54 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed May 20 02:49:11 2009
Subject: svn commit: r192415 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netgraph/netflow
Message-ID: <200905200248.n4K2mrKF016736@svn.freebsd.org>

Author: mav
Date: Wed May 20 02:48:53 2009
New Revision: 192415
URL: http://svn.freebsd.org/changeset/base/192415

Log:
  MFC rev. 192032
  
  Fix copy-paste bug in NGM_NETFLOW_SETCONFIG argument size verification.
  
  PR:		kern/134220
  Submitted by:	Eugene Mychlo

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netgraph/netflow/ng_netflow.c

Modified: stable/7/sys/netgraph/netflow/ng_netflow.c
==============================================================================
--- stable/7/sys/netgraph/netflow/ng_netflow.c	Wed May 20 02:24:09 2009	(r192414)
+++ stable/7/sys/netgraph/netflow/ng_netflow.c	Wed May 20 02:48:53 2009	(r192415)
@@ -422,7 +422,7 @@ ng_netflow_rcvmsg (node_p node, item_p i
 		{
 			struct ng_netflow_setconfig *set;
 
-			if (msg->header.arglen != sizeof(struct ng_netflow_settimeouts))
+			if (msg->header.arglen != sizeof(struct ng_netflow_setconfig))
 				ERROUT(EINVAL);
 
 			set = (struct ng_netflow_setconfig *)msg->data;
From yongari at FreeBSD.org  Wed May 20 03:28:36 2009
From: yongari at FreeBSD.org (Pyun YongHyeon)
Date: Wed May 20 03:28:48 2009
Subject: svn commit: r192417 - in stable/7/sys: . contrib/pf dev/ale
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905200328.n4K3SZRF017808@svn.freebsd.org>

Author: yongari
Date: Wed May 20 03:28:35 2009
New Revision: 192417
URL: http://svn.freebsd.org/changeset/base/192417

Log:
  MFC r189379:
    Now pci(4) handles PCIM_CMD_INTxDIS so there is no need to poke
    this bit in driver.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ale/if_ale.c
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/ale/if_ale.c
==============================================================================
--- stable/7/sys/dev/ale/if_ale.c	Wed May 20 02:51:48 2009	(r192416)
+++ stable/7/sys/dev/ale/if_ale.c	Wed May 20 03:28:35 2009	(r192417)
@@ -1543,20 +1543,11 @@ ale_resume(device_t dev)
 	struct ale_softc *sc;
 	struct ifnet *ifp;
 	int pmc;
-	uint16_t cmd, pmstat;
+	uint16_t pmstat;
 
 	sc = device_get_softc(dev);
 
 	ALE_LOCK(sc);
-	/*
-	 * Clear INTx emulation disable for hardwares that
-	 * is set in resume event. From Linux.
-	 */
-	cmd = pci_read_config(sc->ale_dev, PCIR_COMMAND, 2);
-	if ((cmd & 0x0400) != 0) {
-		cmd &= ~0x0400;
-		pci_write_config(sc->ale_dev, PCIR_COMMAND, cmd, 2);
-	}
 	if (pci_find_extcap(sc->ale_dev, PCIY_PMG, &pmc) == 0) {
 		/* Disable PME and clear PME status. */
 		pmstat = pci_read_config(sc->ale_dev,
From brueffer at FreeBSD.org  Wed May 20 10:04:20 2009
From: brueffer at FreeBSD.org (Christian Brueffer)
Date: Wed May 20 10:04:31 2009
Subject: svn commit: r192434 - stable/7/share/man/man4
Message-ID: <200905201004.n4KA4HZu026600@svn.freebsd.org>

Author: brueffer
Date: Wed May 20 10:04:17 2009
New Revision: 192434
URL: http://svn.freebsd.org/changeset/base/192434

Log:
  MFC: r192220
  
  Sync up to rev. 1.25 from OpenBSD:
  
  1.19: nop
  1.20: nop
  1.21: nop
  1.22: typo fixed
  1.23: license clauses 3 and 4 nuked
  1.24: nop
  1.25: Sun Crypto Accelerator 1000 has a 5821 chip on it
  
  Obtained from:	OpenBSD

Modified:
  stable/7/share/man/man4/   (props changed)
  stable/7/share/man/man4/igb.4   (props changed)
  stable/7/share/man/man4/ubsec.4

Modified: stable/7/share/man/man4/ubsec.4
==============================================================================
--- stable/7/share/man/man4/ubsec.4	Wed May 20 09:44:32 2009	(r192433)
+++ stable/7/share/man/man4/ubsec.4	Wed May 20 10:04:17 2009	(r192434)
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ubsec.4,v 1.18 2002/09/26 07:55:41 miod Exp $
+.\"	$OpenBSD: ubsec.4,v 1.25 2003/08/12 19:42:46 jason Exp $
 .\"
 .\" Copyright (c) 2000 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -11,11 +11,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Jason L. Wright
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -31,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 1, 2006
+.Dd May 16, 2009
 .Dt UBSEC 4
 .Os
 .Sh NAME
@@ -84,7 +79,7 @@ driver supports cards containing any of 
 .It Bluesteel 5501
 The original chipset, no longer made.
 This extremely rare unit
-was not very fast, lacked a RNG, and had a number of other bugs.
+was not very fast, lacked an RNG, and had a number of other bugs.
 .It Bluesteel 5601
 A faster and fixed version of the original, with a random number
 unit and large number engine added.
@@ -98,6 +93,7 @@ Faster version of Bluesteel 5601.
 64 bit version of the chip, and significantly more advanced.
 .It Broadcom BCM5821
 Faster version of the BCM5820.
+This is the chip found on the Sun Crypto Accelerator 1000.
 .It Broadcom BCM5822
 Faster version of the BCM5820.
 .It Broadcom BCM5823
From brueffer at FreeBSD.org  Wed May 20 10:05:46 2009
From: brueffer at FreeBSD.org (Christian Brueffer)
Date: Wed May 20 10:05:58 2009
Subject: svn commit: r192435 - stable/7/share/man/man4
Message-ID: <200905201005.n4KA5jQm026690@svn.freebsd.org>

Author: brueffer
Date: Wed May 20 10:05:44 2009
New Revision: 192435
URL: http://svn.freebsd.org/changeset/base/192435

Log:
  MFC: r192228
  
  Drop clause 3 of the license as per rev. 1.35 from OpenBSD.
  
  Obtained from:	OpenBSD

Modified:
  stable/7/share/man/man4/   (props changed)
  stable/7/share/man/man4/hifn.4
  stable/7/share/man/man4/igb.4   (props changed)

Modified: stable/7/share/man/man4/hifn.4
==============================================================================
--- stable/7/share/man/man4/hifn.4	Wed May 20 10:04:17 2009	(r192434)
+++ stable/7/share/man/man4/hifn.4	Wed May 20 10:05:44 2009	(r192435)
@@ -11,8 +11,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
From brueffer at FreeBSD.org  Wed May 20 10:07:21 2009
From: brueffer at FreeBSD.org (Christian Brueffer)
Date: Wed May 20 10:07:32 2009
Subject: svn commit: r192436 - stable/7/share/man/man9
Message-ID: <200905201007.n4KA7KiJ026768@svn.freebsd.org>

Author: brueffer
Date: Wed May 20 10:07:20 2009
New Revision: 192436
URL: http://svn.freebsd.org/changeset/base/192436

Log:
  MFC: r192265
  
  Document sbuf_new_auto().
  
  While here, add a missing `-' in phk's name.

Modified:
  stable/7/share/man/man9/   (props changed)
  stable/7/share/man/man9/sbuf.9

Modified: stable/7/share/man/man9/sbuf.9
==============================================================================
--- stable/7/share/man/man9/sbuf.9	Wed May 20 10:05:44 2009	(r192435)
+++ stable/7/share/man/man9/sbuf.9	Wed May 20 10:07:20 2009	(r192436)
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2000 Poul Henning Kamp and Dag-Erling Co�dan Sm�rgrav
+.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Co�dan Sm�rgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,12 +25,13 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 9, 2004
+.Dd May 17, 2009
 .Dt SBUF 9
 .Os
 .Sh NAME
 .Nm sbuf ,
 .Nm sbuf_new ,
+.Nm sbuf_new_auto ,
 .Nm sbuf_clear ,
 .Nm sbuf_setpos ,
 .Nm sbuf_bcat ,
@@ -55,6 +56,8 @@
 .In sys/sbuf.h
 .Ft struct sbuf *
 .Fn sbuf_new "struct sbuf *s" "char *buf" "int length" "int flags"
+.Ft struct sbuf *
+.Fn sbuf_new_auto
 .Ft void
 .Fn sbuf_clear "struct sbuf *s"
 .Ft int
@@ -148,6 +151,19 @@ The result of accessing that array direc
 sbuf is undefined.
 .Pp
 The
+.Fn sbuf_new_auto
+function is a shortcut for creating a completely dynamic
+.Nm .
+It is the equivalent of calling
+.Fn sbuf_new
+with values
+.Dv NULL ,
+.Dv NULL ,
+.Dv 0 ,
+and
+.Dv SBUF_AUTOEXTEND .
+.Pp
+The
 .Fn sbuf_delete
 function clears the
 .Fa sbuf
From kmacy at FreeBSD.org  Wed May 20 20:02:42 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 20:02:59 2009
Subject: svn commit: r192469 - stable/7/sys/amd64/include
Message-ID: <200905202002.n4KK2fQE042177@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 20:02:40 2009
New Revision: 192469
URL: http://svn.freebsd.org/changeset/base/192469

Log:
  increase kmem map to 512GB
  
  discussed with: alc

Modified:
  stable/7/sys/amd64/include/vmparam.h

Modified: stable/7/sys/amd64/include/vmparam.h
==============================================================================
--- stable/7/sys/amd64/include/vmparam.h	Wed May 20 20:00:40 2009	(r192468)
+++ stable/7/sys/amd64/include/vmparam.h	Wed May 20 20:02:40 2009	(r192469)
@@ -154,8 +154,7 @@
  * 0xffff800000000000 - 0xffff804020100fff   recursive page table (512GB slot)
  * 0xffff804020101000 - 0xfffffeffffffffff   unused
  * 0xffffff0000000000 - 0xffffff7fffffffff   512GB direct map mappings
- * 0xffffff8000000000 - 0xfffffffe7fffffff   unused (506GB)
- * 0xfffffffe80000000 - 0xffffffffffffffff   6GB kernel map
+ * 0xffffff8000000000 - 0xffffffffffffffff   512GB kernel map
  *
  * Within the kernel map:
  *
@@ -163,7 +162,7 @@
  */
 
 #define	VM_MAX_KERNEL_ADDRESS	KVADDR(KPML4I, NPDPEPG-1, NPDEPG-1, NPTEPG-1)
-#define	VM_MIN_KERNEL_ADDRESS	KVADDR(KPML4I, NPDPEPG-6, 0, 0)
+#define	VM_MIN_KERNEL_ADDRESS	KVADDR(KPML4I, NPDPEPG-512, 0, 0)
 
 #define	DMAP_MIN_ADDRESS	KVADDR(DMPML4I, 0, 0, 0)
 #define	DMAP_MAX_ADDRESS	KVADDR(DMPML4I+1, 0, 0, 0)
From kmacy at FreeBSD.org  Wed May 20 20:08:52 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 20:08:58 2009
Subject: svn commit: r192471 - stable/7/sys/sys
Message-ID: <200905202008.n4KK8p2E042355@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 20:08:51 2009
New Revision: 192471
URL: http://svn.freebsd.org/changeset/base/192471

Log:
  MFC NDINIT macros without changing the size of nameidata

Modified:
  stable/7/sys/sys/fcntl.h
  stable/7/sys/sys/namei.h

Modified: stable/7/sys/sys/fcntl.h
==============================================================================
--- stable/7/sys/sys/fcntl.h	Wed May 20 20:05:56 2009	(r192470)
+++ stable/7/sys/sys/fcntl.h	Wed May 20 20:08:51 2009	(r192471)
@@ -105,6 +105,12 @@ typedef	__pid_t		pid_t;
 #ifdef _KERNEL
 #define	FHASLOCK	0x4000		/* descriptor holds advisory lock */
 #endif
+/*
+ * Magic value that specify the use of the current working directory
+ * to determine the target of relative file paths in the openat() and
+ * similar syscalls.
+ */
+#define	AT_FDCWD		-100
 
 /* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */
 #define	O_NOCTTY	0x8000		/* don't assign controlling terminal */

Modified: stable/7/sys/sys/namei.h
==============================================================================
--- stable/7/sys/sys/namei.h	Wed May 20 20:05:56 2009	(r192470)
+++ stable/7/sys/sys/namei.h	Wed May 20 20:08:51 2009	(r192471)
@@ -86,6 +86,9 @@ struct nameidata {
 	 * through the VOP interface.
 	 */
 	struct componentname ni_cnd;
+#ifdef notyet
+	int	ni_dirfd;		/* starting directory for *at functions */	
+#endif
 };
 
 #ifdef _KERNEL
@@ -148,20 +151,31 @@ struct nameidata {
 /*
  * Initialization of a nameidata structure.
  */
-static void NDINIT(struct nameidata *, u_long, u_long, enum uio_seg,
-	    const char *, struct thread *);
+#define	NDINIT(ndp, op, flags, segflg, namep, td)			\
+	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, NULL, td)
+#define	NDINIT_AT(ndp, op, flags, segflg, namep, dirfd, td)		\
+	NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, NULL, td)
+#define	NDINIT_ATVP(ndp, op, flags, segflg, namep, vp, td)		\
+	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, vp, td)
+
 static __inline void
-NDINIT(struct nameidata *ndp,
+NDINIT_ALL(struct nameidata *ndp,
 	u_long op, u_long flags,
 	enum uio_seg segflg,
 	const char *namep,
+	int dirfd,
+	struct vnode *startdir,
 	struct thread *td)
 {
 	ndp->ni_cnd.cn_nameiop = op;
 	ndp->ni_cnd.cn_flags = flags;
 	ndp->ni_segflg = segflg;
 	ndp->ni_dirp = namep;
+	ndp->ni_startdir = startdir;
 	ndp->ni_cnd.cn_thread = td;
+#ifdef notyet
+	ndp->ni_dirfd = dirfd;
+#endif
 }
 
 #define NDF_NO_DVP_RELE		0x00000001
From kmacy at FreeBSD.org  Wed May 20 20:57:41 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 20:57:58 2009
Subject: svn commit: r192474 - stable/7/sys/sys
Message-ID: <200905202057.n4KKvex0043466@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 20:57:40 2009
New Revision: 192474
URL: http://svn.freebsd.org/changeset/base/192474

Log:
  include fcntl.h to define AT_FDCWD

Modified:
  stable/7/sys/sys/namei.h

Modified: stable/7/sys/sys/namei.h
==============================================================================
--- stable/7/sys/sys/namei.h	Wed May 20 20:18:01 2009	(r192473)
+++ stable/7/sys/sys/namei.h	Wed May 20 20:57:40 2009	(r192474)
@@ -92,6 +92,8 @@ struct nameidata {
 };
 
 #ifdef _KERNEL
+#include 
+
 /*
  * namei operations
  */
From kmacy at FreeBSD.org  Wed May 20 21:04:42 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 21:04:50 2009
Subject: svn commit: r192475 - in stable/7/sys: conf kern sys
Message-ID: <200905202104.n4KL4fOc043655@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 21:04:41 2009
New Revision: 192475
URL: http://svn.freebsd.org/changeset/base/192475

Log:
  - MFC "object specific data" support with rmlocks replaced with rwlocks
  
  - ZFS MFC dependency

Added:
  stable/7/sys/kern/kern_osd.c   (contents, props changed)
  stable/7/sys/sys/osd.h   (contents, props changed)
Modified:
  stable/7/sys/conf/files
  stable/7/sys/kern/kern_proc.c
  stable/7/sys/kern/kern_thread.c
  stable/7/sys/sys/jail.h
  stable/7/sys/sys/proc.h

Modified: stable/7/sys/conf/files
==============================================================================
--- stable/7/sys/conf/files	Wed May 20 20:57:40 2009	(r192474)
+++ stable/7/sys/conf/files	Wed May 20 21:04:41 2009	(r192475)
@@ -1620,6 +1620,7 @@ kern/kern_module.c		standard
 kern/kern_mtxpool.c		standard
 kern/kern_mutex.c		standard
 kern/kern_ntptime.c		standard
+kern/kern_osd.c			standard
 kern/kern_physio.c		standard
 kern/kern_pmc.c			standard
 kern/kern_poll.c		optional device_polling

Added: stable/7/sys/kern/kern_osd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/kern/kern_osd.c	Wed May 20 21:04:41 2009	(r192475)
@@ -0,0 +1,406 @@
+/*-
+ * Copyright (c) 2007 Pawel Jakub Dawidek 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* OSD (Object Specific Data) */
+
+static MALLOC_DEFINE(M_OSD, "osd", "Object Specific Data");
+
+static int osd_debug = 0;
+TUNABLE_INT("debug.osd", &osd_debug);
+SYSCTL_INT(_debug, OID_AUTO, osd, CTLFLAG_RW, &osd_debug, 0, "OSD debug level");
+
+#define	OSD_DEBUG(...)	do {						\
+	if (osd_debug) {						\
+		printf("OSD (%s:%u): ", __func__, __LINE__);		\
+		printf(__VA_ARGS__);					\
+		printf("\n");						\
+	}								\
+} while (0)
+
+static void do_osd_del(u_int type, struct osd *osd, u_int slot);
+static void do_osd_del_locked(u_int type, struct osd *osd, u_int slot);
+
+/*
+ * Lists of objects with OSD.
+ *
+ * Lock key:
+ *  (m) osd_module_lock
+ *  (o) osd_object_lock
+ *  (l) osd_list_lock
+ */
+static LIST_HEAD(, osd)	osd_list[OSD_LAST + 1];		/* (m) */
+static osd_method_t *osd_methods[OSD_LAST + 1];		/* (m) */
+static u_int osd_nslots[OSD_LAST + 1];			/* (m) */
+static osd_destructor_t *osd_destructors[OSD_LAST + 1];	/* (o) */
+static const u_int osd_nmethods[OSD_LAST + 1] = {
+	[OSD_JAIL] = PR_MAXMETHOD,
+};
+
+static struct sx osd_module_lock[OSD_LAST + 1];
+static struct rwlock osd_object_lock[OSD_LAST + 1];
+static struct mtx osd_list_lock[OSD_LAST + 1];
+
+static void
+osd_default_destructor(void *value __unused)
+{
+	/* Do nothing. */
+}
+
+int
+osd_register(u_int type, osd_destructor_t destructor, osd_method_t *methods)
+{
+	void *newptr;
+	u_int i, m;
+
+	KASSERT(type >= OSD_FIRST && type <= OSD_LAST, ("Invalid type."));
+
+	/*
+	 * If no destructor is given, use default one. We need to use some
+	 * destructor, because NULL destructor means unused slot.
+	 */
+	if (destructor == NULL)
+		destructor = osd_default_destructor;
+
+	sx_xlock(&osd_module_lock[type]);
+	/*
+	 * First, we try to find unused slot.
+	 */
+	for (i = 0; i < osd_nslots[type]; i++) {
+		if (osd_destructors[type][i] == NULL) {
+			OSD_DEBUG("Unused slot found (type=%u, slot=%u).",
+			    type, i);
+			break;
+		}
+	}
+	/*
+	 * If no unused slot was found, allocate one.
+	 */
+	if (i == osd_nslots[type]) {
+		osd_nslots[type]++;
+		if (osd_nmethods[type] != 0)
+			osd_methods[type] = realloc(osd_methods[type],
+			    sizeof(osd_method_t) * osd_nslots[type] *
+			    osd_nmethods[type], M_OSD, M_WAITOK);
+		newptr = malloc(sizeof(osd_destructor_t) * osd_nslots[type],
+		    M_OSD, M_WAITOK);
+		rw_wlock(&osd_object_lock[type]);
+		bcopy(osd_destructors[type], newptr,
+		    sizeof(osd_destructor_t) * i);
+		free(osd_destructors[type], M_OSD);
+		osd_destructors[type] = newptr;
+		rw_wunlock(&osd_object_lock[type]);
+		OSD_DEBUG("New slot allocated (type=%u, slot=%u).",
+		    type, i + 1);
+	}
+
+	osd_destructors[type][i] = destructor;
+	if (osd_nmethods[type] != 0) {
+		for (m = 0; m < osd_nmethods[type]; m++)
+			osd_methods[type][i * osd_nmethods[type] + m] =
+			    methods != NULL ? methods[m] : NULL;
+	}
+	sx_xunlock(&osd_module_lock[type]);
+	return (i + 1);
+}
+
+void
+osd_deregister(u_int type, u_int slot)
+{
+	struct osd *osd, *tosd;
+
+	KASSERT(type >= OSD_FIRST && type <= OSD_LAST, ("Invalid type."));
+	KASSERT(slot > 0, ("Invalid slot."));
+	KASSERT(osd_destructors[type][slot - 1] != NULL, ("Unused slot."));
+
+	sx_xlock(&osd_module_lock[type]);
+	rw_wlock(&osd_object_lock[type]);
+	/*
+	 * Free all OSD for the given slot.
+	 */
+	mtx_lock(&osd_list_lock[type]);
+	LIST_FOREACH_SAFE(osd, &osd_list[type], osd_next, tosd)
+		do_osd_del_locked(type, osd, slot);
+	mtx_unlock(&osd_list_lock[type]);
+	/*
+	 * Set destructor to NULL to free the slot.
+	 */
+	osd_destructors[type][slot - 1] = NULL;
+	if (slot == osd_nslots[type]) {
+		osd_nslots[type]--;
+		osd_destructors[type] = realloc(osd_destructors[type],
+		    sizeof(osd_destructor_t) * osd_nslots[type], M_OSD,
+		    M_NOWAIT | M_ZERO);
+		if (osd_nmethods[type] != 0)
+			osd_methods[type] = realloc(osd_methods[type],
+			    sizeof(osd_method_t) * osd_nslots[type] *
+			    osd_nmethods[type], M_OSD, M_NOWAIT | M_ZERO);
+		/*
+		 * We always reallocate to smaller size, so we assume it will
+		 * always succeed.
+		 */
+		KASSERT(osd_destructors[type] != NULL &&
+		    (osd_nmethods[type] == 0 || osd_methods[type] != NULL),
+		    ("realloc() failed"));
+		OSD_DEBUG("Deregistration of the last slot (type=%u, slot=%u).",
+		    type, slot);
+	} else {
+		OSD_DEBUG("Slot deregistration (type=%u, slot=%u).",
+		    type, slot);
+	}
+	rw_wunlock(&osd_object_lock[type]);
+	sx_xunlock(&osd_module_lock[type]);
+}
+
+int
+osd_set(u_int type, struct osd *osd, u_int slot, void *value)
+{
+
+	KASSERT(type >= OSD_FIRST && type <= OSD_LAST, ("Invalid type."));
+	KASSERT(slot > 0, ("Invalid slot."));
+	KASSERT(osd_destructors[type][slot - 1] != NULL, ("Unused slot."));
+
+	rw_rlock(&osd_object_lock[type]);
+	if (slot > osd->osd_nslots) {
+		if (value == NULL) {
+			OSD_DEBUG(
+			    "Not allocating null slot (type=%u, slot=%u).",
+			    type, slot);
+			rw_runlock(&osd_object_lock[type]);
+			return (0);
+		} else if (osd->osd_nslots == 0) {
+			/*
+			 * First OSD for this object, so we need to allocate
+			 * space and put it onto the list.
+			 */
+			osd->osd_slots = malloc(sizeof(void *) * slot, M_OSD,
+			    M_NOWAIT | M_ZERO);
+			if (osd->osd_slots == NULL) {
+				rw_runlock(&osd_object_lock[type]);
+				return (ENOMEM);
+			}
+			osd->osd_nslots = slot;
+			mtx_lock(&osd_list_lock[type]);
+			LIST_INSERT_HEAD(&osd_list[type], osd, osd_next);
+			mtx_unlock(&osd_list_lock[type]);
+			OSD_DEBUG("Setting first slot (type=%u).", type);
+		} else {
+			void *newptr;
+
+			/*
+			 * Too few slots allocated here, needs to extend
+			 * the array.
+			 */
+			newptr = realloc(osd->osd_slots, sizeof(void *) * slot,
+			    M_OSD, M_NOWAIT | M_ZERO);
+			if (newptr == NULL) {
+				rw_runlock(&osd_object_lock[type]);
+				return (ENOMEM);
+			}
+			osd->osd_slots = newptr;
+			osd->osd_nslots = slot;
+			OSD_DEBUG("Growing slots array (type=%u).", type);
+		}
+	}
+	OSD_DEBUG("Setting slot value (type=%u, slot=%u, value=%p).", type,
+	    slot, value);
+	osd->osd_slots[slot - 1] = value;
+	rw_runlock(&osd_object_lock[type]);
+	return (0);
+}
+
+void *
+osd_get(u_int type, struct osd *osd, u_int slot)
+{
+	void *value;
+
+	KASSERT(type >= OSD_FIRST && type <= OSD_LAST, ("Invalid type."));
+	KASSERT(slot > 0, ("Invalid slot."));
+	KASSERT(osd_destructors[type][slot - 1] != NULL, ("Unused slot."));
+
+	rw_rlock(&osd_object_lock[type]);
+	if (slot > osd->osd_nslots) {
+		value = NULL;
+		OSD_DEBUG("Slot doesn't exist (type=%u, slot=%u).", type, slot);
+	} else {
+		value = osd->osd_slots[slot - 1];
+		OSD_DEBUG("Returning slot value (type=%u, slot=%u, value=%p).",
+		    type, slot, value);
+	}
+	rw_runlock(&osd_object_lock[type]);
+	return (value);
+}
+
+static void
+do_osd_del_locked(u_int type, struct osd *osd, u_int slot)
+{
+	int i;
+
+	KASSERT(type >= OSD_FIRST && type <= OSD_LAST, ("Invalid type."));
+	KASSERT(slot > 0, ("Invalid slot."));
+	KASSERT(osd_destructors[type][slot - 1] != NULL, ("Unused slot."));
+	mtx_assert(&osd_list_lock[type], MA_OWNED);
+	
+	OSD_DEBUG("Deleting slot (type=%u, slot=%u).", type, slot);
+
+	if (slot > osd->osd_nslots) {
+		OSD_DEBUG("Slot doesn't exist (type=%u, slot=%u).", type, slot);
+		return;
+	}
+	if (osd->osd_slots[slot - 1] != NULL) {
+		osd_destructors[type][slot - 1](osd->osd_slots[slot - 1]);
+		osd->osd_slots[slot - 1] = NULL;
+	}
+	for (i = osd->osd_nslots - 1; i >= 0; i--) {
+		if (osd->osd_slots[i] != NULL) {
+			OSD_DEBUG("Slot still has a value (type=%u, slot=%u).",
+			    type, i + 1);
+			break;
+		}
+	}
+	if (i == -1) {
+		/* No values left for this object. */
+		OSD_DEBUG("No more slots left (type=%u).", type);
+		LIST_REMOVE(osd, osd_next);
+		free(osd->osd_slots, M_OSD);
+		osd->osd_slots = NULL;
+		osd->osd_nslots = 0;
+	} else if (slot == osd->osd_nslots) {
+		/* This was the last slot. */
+		osd->osd_slots = realloc(osd->osd_slots,
+		    sizeof(void *) * (i + 1), M_OSD, M_NOWAIT | M_ZERO);
+		/*
+		 * We always reallocate to smaller size, so we assume it will
+		 * always succeed.
+		 */
+		KASSERT(osd->osd_slots != NULL, ("realloc() failed"));
+		osd->osd_nslots = i + 1;
+		OSD_DEBUG("Reducing slots array to %u (type=%u).",
+		    osd->osd_nslots, type);
+	}
+}
+
+static void
+do_osd_del(u_int type, struct osd *osd, u_int slot)
+{
+	mtx_lock(&osd_list_lock[type]);
+	do_osd_del_locked(type, osd, slot);
+	mtx_unlock(&osd_list_lock[type]);
+}
+
+void
+osd_del(u_int type, struct osd *osd, u_int slot)
+{
+
+	rw_rlock(&osd_object_lock[type]);
+	do_osd_del(type, osd, slot);
+	rw_runlock(&osd_object_lock[type]);
+}
+
+
+
+int
+osd_call(u_int type, u_int method, void *obj, void *data)
+{
+	osd_method_t methodfun;
+	int error, i;
+
+	KASSERT(type >= OSD_FIRST && type <= OSD_LAST, ("Invalid type."));
+	KASSERT(method < osd_nmethods[type], ("Invalid method."));
+
+	/*
+	 * Call this method for every slot that defines it, stopping if an
+	 * error is encountered.
+	 */
+	error = 0;
+	sx_slock(&osd_module_lock[type]);
+	for (i = 0; i < osd_nslots[type]; i++) {
+		methodfun =
+		    osd_methods[type][i * osd_nmethods[type] + method];
+		if (methodfun != NULL && (error = methodfun(obj, data)) != 0)
+			break;
+	}
+	sx_sunlock(&osd_module_lock[type]);
+	return (error);
+}
+
+void
+osd_exit(u_int type, struct osd *osd)
+{
+	u_int i;
+
+	KASSERT(type >= OSD_FIRST && type <= OSD_LAST, ("Invalid type."));
+
+	if (osd->osd_nslots == 0) {
+		KASSERT(osd->osd_slots == NULL, ("Non-null osd_slots."));
+		/* No OSD attached, just leave. */
+		return;
+	}
+
+	rw_rlock(&osd_object_lock[type]);
+	for (i = 1; i <= osd->osd_nslots; i++) {
+		if (osd_destructors[type][i - 1] != NULL)
+			do_osd_del(type, osd, i);
+		else
+			OSD_DEBUG("Unused slot (type=%u, slot=%u).", type, i);
+	}
+	rw_runlock(&osd_object_lock[type]);
+	OSD_DEBUG("Object exit (type=%u).", type);
+}
+
+static void
+osd_init(void *arg __unused)
+{
+	u_int i;
+
+	for (i = OSD_FIRST; i <= OSD_LAST; i++) {
+		osd_nslots[i] = 0;
+		LIST_INIT(&osd_list[i]);
+		sx_init(&osd_module_lock[i], "osd_module");
+		rw_init(&osd_object_lock[i], "osd_object");
+		mtx_init(&osd_list_lock[i], "osd_list", NULL, MTX_DEF);
+		osd_destructors[i] = NULL;
+		osd_methods[i] = NULL;
+	}
+}
+SYSINIT(osd, SI_SUB_LOCK, SI_ORDER_ANY, osd_init, NULL);

Modified: stable/7/sys/kern/kern_proc.c
==============================================================================
--- stable/7/sys/kern/kern_proc.c	Wed May 20 20:57:40 2009	(r192474)
+++ stable/7/sys/kern/kern_proc.c	Wed May 20 21:04:41 2009	(r192475)
@@ -200,6 +200,8 @@ proc_dtor(void *mem, int size, void *arg
 		    ("bad number of threads in exiting process"));
 		KASSERT(STAILQ_EMPTY(&p->p_ktr), ("proc_dtor: non-empty p_ktr"));
 #endif
+		/* Free all OSD associated to this thread. */
+		osd_thread_exit(td);
 
 		/* Dispose of an alternate kstack, if it exists.
 		 * XXX What if there are more than one thread in the proc?

Modified: stable/7/sys/kern/kern_thread.c
==============================================================================
--- stable/7/sys/kern/kern_thread.c	Wed May 20 20:57:40 2009	(r192474)
+++ stable/7/sys/kern/kern_thread.c	Wed May 20 21:04:41 2009	(r192475)
@@ -133,6 +133,9 @@ thread_ctor(void *mem, int size, void *a
 #ifdef AUDIT
 	audit_thread_alloc(td);
 #endif
+	/* Free all OSD associated to this thread. */
+	osd_thread_exit(td);
+
 	umtx_thread_alloc(td);
 	return (0);
 }

Modified: stable/7/sys/sys/jail.h
==============================================================================
--- stable/7/sys/sys/jail.h	Wed May 20 20:57:40 2009	(r192474)
+++ stable/7/sys/sys/jail.h	Wed May 20 21:04:41 2009	(r192475)
@@ -14,6 +14,8 @@
 #define _SYS_JAIL_H_
 
 #ifdef _KERNEL
+#include 
+
 struct jail_v0 {
 	u_int32_t	version;
 	char		*path;
@@ -136,11 +138,28 @@ struct prison {
 	struct in_addr	*pr_ip4;			/* (c) v4 IPs of jail */
 	int		 pr_ip6s;			/* (c) number of v6 IPs */
 	struct in6_addr	*pr_ip6;			/* (c) v6 IPs of jail */
+	struct osd	pr_osd;
 };
 #endif /* _KERNEL || _WANT_PRISON */
 
 #ifdef _KERNEL
 /*
+ * Flag bits set via options or internally
+ */
+#define PR_PERSIST      0x00000001      /* Can exist without processes */
+#define PR_REMOVE       0x01000000      /* In process of being removed */
+
+/*
+ * OSD methods
+ */
+#define PR_METHOD_CREATE        0
+#define PR_METHOD_GET           1
+#define PR_METHOD_SET           2
+#define PR_METHOD_CHECK         3
+#define PR_METHOD_ATTACH        4
+#define PR_MAXMETHOD            5
+
+/*
  * Sysctl-set variables that determine global jail policy
  *
  * XXX MIB entries will need to be protected by a mutex.

Added: stable/7/sys/sys/osd.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/sys/osd.h	Wed May 20 21:04:41 2009	(r192475)
@@ -0,0 +1,101 @@
+/*-
+ * Copyright (c) 2007 Pawel Jakub Dawidek 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
+ */
+
+#ifndef _SYS_OSD_H_
+#define _SYS_OSD_H_
+
+#include 
+
+/*
+ * Lock key:
+ *   (c) container lock (e.g. jail's pr_mtx) and/or osd_object_lock
+ *   (l) osd_list_lock
+ */
+struct osd {
+	u_int		  osd_nslots;	/* (c) */
+	void		**osd_slots;	/* (c) */
+	LIST_ENTRY(osd)	  osd_next;	/* (l) */
+};
+
+#ifdef _KERNEL
+
+#define	OSD_THREAD	0
+#define	OSD_JAIL	1
+
+#define	OSD_FIRST	OSD_THREAD
+#define	OSD_LAST	OSD_JAIL
+
+typedef void (*osd_destructor_t)(void *value);
+typedef int (*osd_method_t)(void *obj, void *data);
+
+int osd_register(u_int type, osd_destructor_t destructor,
+    osd_method_t *methods);
+void osd_deregister(u_int type, u_int slot);
+
+int osd_set(u_int type, struct osd *osd, u_int slot, void *value);
+void *osd_get(u_int type, struct osd *osd, u_int slot);
+void osd_del(u_int type, struct osd *osd, u_int slot);
+int osd_call(u_int type, u_int method, void *obj, void *data);
+
+void osd_exit(u_int type, struct osd *osd);
+
+#define	osd_thread_register(destructor)					\
+	osd_register(OSD_THREAD, (destructor), NULL)
+#define	osd_thread_deregister(slot)					\
+	osd_deregister(OSD_THREAD, (slot))
+#define	osd_thread_set(td, slot, value)					\
+	osd_set(OSD_THREAD, &(td)->td_osd, (slot), (value))
+#define	osd_thread_get(td, slot)					\
+	osd_get(OSD_THREAD, &(td)->td_osd, (slot))
+#define	osd_thread_del(td, slot)	do {				\
+	KASSERT((td) == curthread, ("Not curthread."));			\
+	osd_del(OSD_THREAD, &(td)->td_osd, (slot));			\
+} while (0)
+#define	osd_thread_call(td, method, data)				\
+	osd_call(OSD_THREAD, (method), (td), (data))
+#define	osd_thread_exit(td)						\
+	osd_exit(OSD_THREAD, &(td)->td_osd)
+
+#define	osd_jail_register(destructor, methods)				\
+	osd_register(OSD_JAIL, (destructor), (methods))
+#define	osd_jail_deregister(slot)					\
+	osd_deregister(OSD_JAIL, (slot))
+#define	osd_jail_set(pr, slot, value)					\
+	osd_set(OSD_JAIL, &(pr)->pr_osd, (slot), (value))
+#define	osd_jail_get(pr, slot)						\
+	osd_get(OSD_JAIL, &(pr)->pr_osd, (slot))
+#define	osd_jail_del(pr, slot)						\
+	osd_del(OSD_JAIL, &(pr)->pr_osd, (slot))
+#define	osd_jail_call(pr, method, data)					\
+	osd_call(OSD_JAIL, (method), (pr), (data))
+#define	osd_jail_exit(pr)						\
+	osd_exit(OSD_JAIL, &(pr)->pr_osd)
+
+#endif	/* _KERNEL */
+
+#endif	/* !_SYS_OSD_H_ */

Modified: stable/7/sys/sys/proc.h
==============================================================================
--- stable/7/sys/sys/proc.h	Wed May 20 20:57:40 2009	(r192474)
+++ stable/7/sys/sys/proc.h	Wed May 20 21:04:41 2009	(r192475)
@@ -46,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 			/* XXX. */
 #include 
@@ -305,6 +306,7 @@ struct thread {
 	struct file	*td_fpop;	/* (k) file referencing cdev under op */
 	struct kdtrace_thread	*td_dtrace; /* (*) DTrace-specific data. */
 	int		td_errno;	/* Error returned by last syscall. */
+	struct osd	td_osd;		/* (k) Object specific data. */
 };
 
 struct mtx *thread_lock_block(struct thread *);
From delphij at FreeBSD.org  Wed May 20 21:13:50 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Wed May 20 21:14:07 2009
Subject: svn commit: r192477 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/bce dev/cxgb
Message-ID: <200905202113.n4KLDnBT043958@svn.freebsd.org>

Author: delphij
Date: Wed May 20 21:13:49 2009
New Revision: 192477
URL: http://svn.freebsd.org/changeset/base/192477

Log:
  MFC r191923 (davidch):
  
    - Fixed incorrect packet length problem caused be earlier change to
      support ZERO_COPY_SOCKETS.
    - Created #define for context initialization retry count.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/bce/if_bce.c
  stable/7/sys/dev/bce/if_bcereg.h
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/bce/if_bce.c
==============================================================================
--- stable/7/sys/dev/bce/if_bce.c	Wed May 20 21:07:15 2009	(r192476)
+++ stable/7/sys/dev/bce/if_bce.c	Wed May 20 21:13:49 2009	(r192477)
@@ -4204,8 +4204,7 @@ bce_init_ctx(struct bce_softc *sc)
 
 	if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
 		(BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
-		/* DRC: Replace this constant value with a #define. */
-		int i, retry_cnt = 10;
+		int i, retry_cnt = CTX_INIT_RETRY_COUNT;
 		u32 val;
 
 		DBPRINT(sc, BCE_INFO_CTX, "Initializing 5709 context.\n");
@@ -5895,6 +5894,9 @@ bce_rx_intr(struct bce_softc *sc)
 			/* Set the total packet length. */
 			m0->m_pkthdr.len = m0->m_len = pkt_len;
 		}
+#else
+        /* Set the total packet length. */
+		m0->m_pkthdr.len = m0->m_len = pkt_len;
 #endif
 
 		/* Remove the trailing Ethernet FCS. */

Modified: stable/7/sys/dev/bce/if_bcereg.h
==============================================================================
--- stable/7/sys/dev/bce/if_bcereg.h	Wed May 20 21:07:15 2009	(r192476)
+++ stable/7/sys/dev/bce/if_bcereg.h	Wed May 20 21:13:49 2009	(r192477)
@@ -6229,6 +6229,8 @@ struct l2_fhdr {
 
 #endif /* ZERO_COPY_SOCKETS */
 
+#define CTX_INIT_RETRY_COUNT        10
+
 /* Context size. */
 #define CTX_SHIFT                   7
 #define CTX_SIZE                    (1 << CTX_SHIFT)
From delphij at FreeBSD.org  Wed May 20 21:17:11 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Wed May 20 21:17:22 2009
Subject: svn commit: r192478 - in stable/7/sys: . dev/bge
Message-ID: <200905202117.n4KLHA2o044080@svn.freebsd.org>

Author: delphij
Date: Wed May 20 21:17:10 2009
New Revision: 192478
URL: http://svn.freebsd.org/changeset/base/192478

Log:
  MFC r192127:
  
  Try to workaround a race where bge_stop() may sneak in when bge_rxeof()
  drops and re-grabs the softc mutex in the middle, resulting in kernel
  trap 12.  This may happen when a lot of traffic is being hammered on
  one bge(4) interface while the system is shutting down.
  
  Reported by:	Alexander Sack 
  PR:		kern/134548

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/dev/bge/if_bge.c

Modified: stable/7/sys/dev/bge/if_bge.c
==============================================================================
--- stable/7/sys/dev/bge/if_bge.c	Wed May 20 21:13:49 2009	(r192477)
+++ stable/7/sys/dev/bge/if_bge.c	Wed May 20 21:17:10 2009	(r192478)
@@ -3193,6 +3193,9 @@ bge_rxeof(struct bge_softc *sc)
 		BGE_UNLOCK(sc);
 		(*ifp->if_input)(ifp, m);
 		BGE_LOCK(sc);
+
+		if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
+			return;
 	}
 
 	if (stdcnt > 0)
@@ -3301,6 +3304,10 @@ bge_poll(struct ifnet *ifp, enum poll_cm
 
 	sc->rxcycles = count;
 	bge_rxeof(sc);
+	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+		BGE_UNLOCK(sc);
+		return;
+	}
 	bge_txeof(sc);
 	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 		bge_start_locked(ifp);
@@ -3370,7 +3377,9 @@ bge_intr(void *xsc)
 	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 		/* Check RX return ring producer/consumer. */
 		bge_rxeof(sc);
+	}
 
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 		/* Check TX ring producer/consumer. */
 		bge_txeof(sc);
 	}
From kmacy at FreeBSD.org  Wed May 20 22:09:50 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:10:02 2009
Subject: svn commit: r192483 - stable/7/sys/sys
Message-ID: <200905202209.n4KM9nVq045424@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:09:49 2009
New Revision: 192483
URL: http://svn.freebsd.org/changeset/base/192483

Log:
  - make vfsoptlist globally visible
  - ZFS MFC dependency

Modified:
  stable/7/sys/sys/mount.h

Modified: stable/7/sys/sys/mount.h
==============================================================================
--- stable/7/sys/sys/mount.h	Wed May 20 22:01:43 2009	(r192482)
+++ stable/7/sys/sys/mount.h	Wed May 20 22:09:49 2009	(r192483)
@@ -131,8 +131,16 @@ struct ostatfs {
 
 TAILQ_HEAD(vnodelst, vnode);
 
-struct vfsoptlist;
-struct vfsopt;
+/* Mount options list */
+TAILQ_HEAD(vfsoptlist, vfsopt);
+struct vfsopt {
+	TAILQ_ENTRY(vfsopt) link;
+	char	*name;
+	void	*value;
+	int	len;
+	int	pos;
+	int	seen;
+};
 
 /*
  * Structure per mounted filesystem.  Each mounted filesystem has an
From kmacy at FreeBSD.org  Wed May 20 22:10:35 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:11:59 2009
Subject: svn commit: r192484 - stable/7/sys/sys
Message-ID: <200905202210.n4KMAYOt045541@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:10:34 2009
New Revision: 192484
URL: http://svn.freebsd.org/changeset/base/192484

Log:
  MFC accmode_t
  ZFS MFC dependency

Modified:
  stable/7/sys/sys/_types.h
  stable/7/sys/sys/types.h

Modified: stable/7/sys/sys/_types.h
==============================================================================
--- stable/7/sys/sys/_types.h	Wed May 20 22:09:49 2009	(r192483)
+++ stable/7/sys/sys/_types.h	Wed May 20 22:10:34 2009	(r192484)
@@ -47,6 +47,7 @@ typedef	__uint32_t	__ino_t;	/* inode num
 typedef	long		__key_t;	/* IPC key (for Sys V IPC) */
 typedef	__int32_t	__lwpid_t;	/* Thread ID (a.k.a. LWP) */
 typedef	__uint16_t	__mode_t;	/* permissions */
+typedef	int		__accmode_t;	/* access permissions */
 typedef	int		__nl_item;
 typedef	__uint16_t	__nlink_t;	/* link count */
 typedef	__int64_t	__off_t;	/* file offset */

Modified: stable/7/sys/sys/types.h
==============================================================================
--- stable/7/sys/sys/types.h	Wed May 20 22:09:49 2009	(r192483)
+++ stable/7/sys/sys/types.h	Wed May 20 22:10:34 2009	(r192484)
@@ -210,6 +210,11 @@ typedef	__nlink_t	nlink_t;	/* link count
 #define	_NLINK_T_DECLARED
 #endif
 
+#ifndef _ACCMODE_T_DECLARED
+typedef	__accmode_t	accmode_t;	/* access permissions */
+#define	_ACCMODE_T_DECLARED
+#endif
+
 #ifndef _OFF_T_DECLARED
 typedef	__off_t		off_t;		/* file offset */
 #define	_OFF_T_DECLARED
From kmacy at FreeBSD.org  Wed May 20 22:13:22 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:13:53 2009
Subject: svn commit: r192485 - in stable/7/sys: conf libkern sys
Message-ID: <200905202213.n4KMDLcm045650@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:13:21 2009
New Revision: 192485
URL: http://svn.freebsd.org/changeset/base/192485

Log:
  MFC memmove support
  ZFS MFC dependency

Added:
  stable/7/sys/libkern/memmove.c   (contents, props changed)
Modified:
  stable/7/sys/conf/files
  stable/7/sys/sys/systm.h

Modified: stable/7/sys/conf/files
==============================================================================
--- stable/7/sys/conf/files	Wed May 20 22:10:34 2009	(r192484)
+++ stable/7/sys/conf/files	Wed May 20 22:13:21 2009	(r192485)
@@ -1755,6 +1755,7 @@ libkern/iconv_xlat16.c		optional libicon
 libkern/index.c			standard
 libkern/inet_ntoa.c		standard
 libkern/mcount.c		optional profiling-routine
+libkern/memmove.c		standard
 libkern/qsort.c			standard
 libkern/qsort_r.c		standard
 libkern/random.c		standard

Added: stable/7/sys/libkern/memmove.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/libkern/memmove.c	Wed May 20 22:13:21 2009	(r192485)
@@ -0,0 +1,38 @@
+/*-
+ * Copyright (c) 2009 Roman Divacky 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+*/
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+
+void *
+memmove(void *dest, const void *src, size_t n)
+{
+
+	bcopy(src, dest, n);
+	return (dest);
+}

Modified: stable/7/sys/sys/systm.h
==============================================================================
--- stable/7/sys/sys/systm.h	Wed May 20 22:10:34 2009	(r192484)
+++ stable/7/sys/sys/systm.h	Wed May 20 22:13:21 2009	(r192485)
@@ -191,6 +191,7 @@ void	bcopy(const void *from, void *to, s
 void	bzero(void *buf, size_t len) __nonnull(1);
 
 void	*memcpy(void *to, const void *from, size_t len) __nonnull(1) __nonnull(2);
+void	*memmove(void *dest, const void *src, size_t len) __nonnull(1) __nonnull(2);
 
 int	copystr(const void * __restrict kfaddr, void * __restrict kdaddr,
 	    size_t len, size_t * __restrict lencopied)
From kmacy at FreeBSD.org  Wed May 20 22:19:50 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:20:06 2009
Subject: svn commit: r192487 - stable/7/sys/sys
Message-ID: <200905202219.n4KMJn6Y045844@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:19:48 2009
New Revision: 192487
URL: http://svn.freebsd.org/changeset/base/192487

Log:
  add UID_NOBODY

Modified:
  stable/7/sys/sys/conf.h

Modified: stable/7/sys/sys/conf.h
==============================================================================
--- stable/7/sys/sys/conf.h	Wed May 20 22:19:22 2009	(r192486)
+++ stable/7/sys/sys/conf.h	Wed May 20 22:19:48 2009	(r192487)
@@ -290,6 +290,7 @@ void	devfs_fpdrop(struct file *fp);	/* X
 #define		UID_ROOT	0
 #define		UID_BIN		3
 #define		UID_UUCP	66
+#define		UID_NOBODY	65534
 
 #define		GID_WHEEL	0
 #define		GID_KMEM	2
From kmacy at FreeBSD.org  Wed May 20 22:24:32 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:24:48 2009
Subject: svn commit: r192488 - stable/7/sys/kern
Message-ID: <200905202224.n4KMOVSv046005@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:24:31 2009
New Revision: 192488
URL: http://svn.freebsd.org/changeset/base/192488

Log:
  make vfsopt globally visible for ZFS

Modified:
  stable/7/sys/kern/vfs_mount.c

Modified: stable/7/sys/kern/vfs_mount.c
==============================================================================
--- stable/7/sys/kern/vfs_mount.c	Wed May 20 22:19:48 2009	(r192487)
+++ stable/7/sys/kern/vfs_mount.c	Wed May 20 22:24:31 2009	(r192488)
@@ -100,14 +100,6 @@ struct mntlist mountlist = TAILQ_HEAD_IN
 struct mtx mountlist_mtx;
 MTX_SYSINIT(mountlist, &mountlist_mtx, "mountlist", MTX_DEF);
 
-TAILQ_HEAD(vfsoptlist, vfsopt);
-struct vfsopt {
-	TAILQ_ENTRY(vfsopt) link;
-	char	*name;
-	void	*value;
-	int	len;
-};
-
 /*
  * The vnode of the system's root (/ in the filesystem, without chroot
  * active.)
From kmacy at FreeBSD.org  Wed May 20 22:26:04 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:26:15 2009
Subject: svn commit: r192489 - stable/7/sys/kern
Message-ID: <200905202226.n4KMQ3CG046084@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:26:03 2009
New Revision: 192489
URL: http://svn.freebsd.org/changeset/base/192489

Log:
  make vdestroy globally visible for ZFS

Modified:
  stable/7/sys/kern/vfs_subr.c

Modified: stable/7/sys/kern/vfs_subr.c
==============================================================================
--- stable/7/sys/kern/vfs_subr.c	Wed May 20 22:24:31 2009	(r192488)
+++ stable/7/sys/kern/vfs_subr.c	Wed May 20 22:26:03 2009	(r192489)
@@ -104,7 +104,6 @@ static void	v_decr_useonly(struct vnode 
 static void	v_upgrade_usecount(struct vnode *);
 static void	vfree(struct vnode *);
 static void	vnlru_free(int);
-static void	vdestroy(struct vnode *);
 static void	vgonel(struct vnode *);
 static void	vfs_knllock(void *arg);
 static void	vfs_knlunlock(void *arg);
@@ -777,7 +776,7 @@ SYSINIT(vnlru, SI_SUB_KTHREAD_UPDATE, SI
  * Routines having to do with the management of the vnode table.
  */
 
-static void
+void
 vdestroy(struct vnode *vp)
 {
 	struct bufobj *bo;
From kmacy at FreeBSD.org  Wed May 20 22:27:19 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:27:36 2009
Subject: svn commit: r192490 - stable/7/sys/sys
Message-ID: <200905202227.n4KMRIjW046143@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:27:18 2009
New Revision: 192490
URL: http://svn.freebsd.org/changeset/base/192490

Log:
  add vdestroy declaration now that it is no longer static
  - needed by ZFS

Modified:
  stable/7/sys/sys/vnode.h

Modified: stable/7/sys/sys/vnode.h
==============================================================================
--- stable/7/sys/sys/vnode.h	Wed May 20 22:26:03 2009	(r192489)
+++ stable/7/sys/sys/vnode.h	Wed May 20 22:27:18 2009	(r192490)
@@ -717,6 +717,7 @@ void	vrele(struct vnode *vp);
 void	vref(struct vnode *vp);
 int	vrefcnt(struct vnode *vp);
 void 	v_addpollinfo(struct vnode *vp);
+void	vdestroy(struct vnode *vp);
 
 int vnode_create_vobject(struct vnode *vp, off_t size, struct thread *td);
 void vnode_destroy_vobject(struct vnode *vp);
From kmacy at FreeBSD.org  Wed May 20 22:28:40 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:28:48 2009
Subject: svn commit: r192491 - in stable/7/sys: kern sys
Message-ID: <200905202228.n4KMSdsE046212@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:28:39 2009
New Revision: 192491
URL: http://svn.freebsd.org/changeset/base/192491

Log:
  MFC quad tunables and sysctls for setting ZFS arc cache size

Modified:
  stable/7/sys/kern/kern_environment.c
  stable/7/sys/sys/kernel.h
  stable/7/sys/sys/sysctl.h

Modified: stable/7/sys/kern/kern_environment.c
==============================================================================
--- stable/7/sys/kern/kern_environment.c	Wed May 20 22:27:18 2009	(r192490)
+++ stable/7/sys/kern/kern_environment.c	Wed May 20 22:28:39 2009	(r192491)
@@ -553,6 +553,14 @@ tunable_ulong_init(void *data)
 }
 
 void
+tunable_quad_init(void *data)
+{
+	struct tunable_quad *d = (struct tunable_quad *)data;
+
+	TUNABLE_QUAD_FETCH(d->path, d->var);
+}
+
+void
 tunable_str_init(void *data)
 {
 	struct tunable_str *d = (struct tunable_str *)data;

Modified: stable/7/sys/sys/kernel.h
==============================================================================
--- stable/7/sys/sys/kernel.h	Wed May 20 22:27:18 2009	(r192490)
+++ stable/7/sys/sys/kernel.h	Wed May 20 22:28:39 2009	(r192491)
@@ -329,6 +329,25 @@ struct tunable_ulong {
 
 #define	TUNABLE_ULONG_FETCH(path, var)	getenv_ulong((path), (var))
 
+/*
+ * quad
+ */
+extern void tunable_quad_init(void *);
+struct tunable_quad {
+	const char *path;
+	quad_t *var;
+};
+#define	TUNABLE_QUAD(path, var)					\
+	static struct tunable_quad __CONCAT(__tunable_quad_, __LINE__) = { \
+		(path),						\
+		(var),						\
+	};							\
+	SYSINIT(__CONCAT(__Tunable_init_, __LINE__),		\
+	    SI_SUB_TUNABLES, SI_ORDER_MIDDLE, tunable_quad_init, \
+	    &__CONCAT(__tunable_quad_, __LINE__))
+
+#define	TUNABLE_QUAD_FETCH(path, var)	getenv_quad((path), (var))
+
 extern void tunable_str_init(void *);
 struct tunable_str {
 	const char *path;

Modified: stable/7/sys/sys/sysctl.h
==============================================================================
--- stable/7/sys/sys/sysctl.h	Wed May 20 22:27:18 2009	(r192490)
+++ stable/7/sys/sys/sysctl.h	Wed May 20 22:28:39 2009	(r192491)
@@ -295,6 +295,15 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_e
 	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_ULONG|CTLFLAG_MPSAFE|(access),	    \
 	ptr, 0, sysctl_handle_long, "LX", __DESCR(descr))
 
+/* Oid for a quad.  The pointer must be non NULL. */
+#define SYSCTL_QUAD(parent, nbr, name, access, ptr, val, descr) \
+	SYSCTL_OID(parent, nbr, name, CTLTYPE_QUAD|CTLFLAG_MPSAFE|(access), \
+		ptr, val, sysctl_handle_quad, "Q", __DESCR(descr))
+
+#define SYSCTL_ADD_QUAD(ctx, parent, nbr, name, access, ptr, descr)	    \
+	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_QUAD|CTLFLAG_MPSAFE|(access),	    \
+	ptr, 0, sysctl_handle_quad, "Q", __DESCR(descr))
+
 /* Oid for an opaque object.  Specified by a pointer and a length. */
 #define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) \
 	SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access), \
From kmacy at FreeBSD.org  Wed May 20 22:30:59 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:31:10 2009
Subject: svn commit: r192493 - stable/7/sys/kern
Message-ID: <200905202230.n4KMUwhg046344@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:30:57 2009
New Revision: 192493
URL: http://svn.freebsd.org/changeset/base/192493

Log:
  td_osd is at the end of struct thread to avoid breaking the ABI
  as a side effect it is outside of the td_startzero-td_endzero range,
  requiring it to be separately zeroed

Modified:
  stable/7/sys/kern/kern_fork.c
  stable/7/sys/kern/kern_kse.c
  stable/7/sys/kern/kern_thr.c

Modified: stable/7/sys/kern/kern_fork.c
==============================================================================
--- stable/7/sys/kern/kern_fork.c	Wed May 20 22:28:55 2009	(r192492)
+++ stable/7/sys/kern/kern_fork.c	Wed May 20 22:30:57 2009	(r192493)
@@ -507,6 +507,7 @@ again:
 
 	bcopy(&td->td_startcopy, &td2->td_startcopy,
 	    __rangeof(struct thread, td_startcopy, td_endcopy));
+	bzero(&td2->td_osd, sizeof(struct osd));
 
 	td2->td_sigstk = td->td_sigstk;
 	td2->td_sigmask = td->td_sigmask;

Modified: stable/7/sys/kern/kern_kse.c
==============================================================================
--- stable/7/sys/kern/kern_kse.c	Wed May 20 22:28:55 2009	(r192492)
+++ stable/7/sys/kern/kern_kse.c	Wed May 20 22:30:57 2009	(r192493)
@@ -1014,6 +1014,7 @@ thread_alloc_spare(struct thread *td)
 	td->td_standin = spare;
 	bzero(&spare->td_startzero,
 	    __rangeof(struct thread, td_startzero, td_endzero));
+	bzero(&spare->td_osd, sizeof(struct osd));
 	spare->td_proc = td->td_proc;
 	spare->td_ucred = crhold(td->td_ucred);
 	spare->td_flags = TDF_INMEM;

Modified: stable/7/sys/kern/kern_thr.c
==============================================================================
--- stable/7/sys/kern/kern_thr.c	Wed May 20 22:28:55 2009	(r192492)
+++ stable/7/sys/kern/kern_thr.c	Wed May 20 22:30:57 2009	(r192493)
@@ -199,6 +199,7 @@ create_thread(struct thread *td, mcontex
 	    __rangeof(struct thread, td_startzero, td_endzero));
 	bcopy(&td->td_startcopy, &newtd->td_startcopy,
 	    __rangeof(struct thread, td_startcopy, td_endcopy));
+	bzero(&newtd->td_osd, sizeof(struct osd));
 	newtd->td_proc = td->td_proc;
 	newtd->td_ucred = crhold(td->td_ucred);
 
From kmacy at FreeBSD.org  Wed May 20 22:32:26 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 22:32:32 2009
Subject: svn commit: r192494 - stable/7/sys/kern
Message-ID: <200905202232.n4KMWPJU046415@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 22:32:25 2009
New Revision: 192494
URL: http://svn.freebsd.org/changeset/base/192494

Log:
  MFC minimal zfs lock ordering for WITNESS
  
  (dnode -> dirty record -> dbuf)

Modified:
  stable/7/sys/kern/subr_witness.c

Modified: stable/7/sys/kern/subr_witness.c
==============================================================================
--- stable/7/sys/kern/subr_witness.c	Wed May 20 22:30:57 2009	(r192493)
+++ stable/7/sys/kern/subr_witness.c	Wed May 20 22:32:25 2009	(r192494)
@@ -397,6 +397,13 @@ static struct witness_order_list_entry o
 	{ "vnode interlock", &lock_class_mtx_sleep },
 	{ NULL, NULL },
 	/*
+	 * ZFS locking
+	 */
+	{ "dn->dn_mtx", &lock_class_sx },
+	{ "dr->dt.di.dr_mtx", &lock_class_sx },
+	{ "db->db_mtx", &lock_class_sx },
+	{ NULL, NULL },
+	/*
 	 * spin locks
 	 */
 #ifdef SMP
From kmacy at FreeBSD.org  Wed May 20 23:35:01 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Wed May 20 23:35:16 2009
Subject: svn commit: r192498 - in stable/7: . cddl
	cddl/compat/opensolaris/include cddl/compat/opensolaris/misc
	cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs
	cddl/contrib/opensolaris/cmd...
Message-ID: <200905202335.n4KNZ0ng047789@svn.freebsd.org>

Author: kmacy
Date: Wed May 20 23:34:59 2009
New Revision: 192498
URL: http://svn.freebsd.org/changeset/base/192498

Log:
  MFC ZFS version 13. This includes the changes by pjd (see original message
  below) as well as the following:
  
  - the recurring deadlock was fixed by deferring vinactive to a dedicated thread
  
  - zfs boot for all pool types now works
        Submitted by: dfr
  
  - kmem now goes up to 512GB so arc is now limited by physmem
  
  - the arc now experiences backpressure from the vm (which can be too
  much - but this allows ZFS to work without any tunables on amd64)
  
  - frequently recurring LOR in the ARC fixed
  
  - zfs send coredump fix
  
  - fixes for various PRs
  
  Supported by: Barrett Lyon, BitGravity
  
  Revision 185029 - (view) (annotate) - [select for diffs]
  Modified Mon Nov 17 20:49:29 2008 UTC (6 months ago) by pjd
  File length: 38244 byte(s)
  Diff to previous 177698
  
  Update ZFS from version 6 to 13 and bring some FreeBSD-specific changes.
  
  This bring huge amount of changes, I'll enumerate only user-visible changes:
  
  - Delegated Administration
  
         Allows regular users to perform ZFS operations, like file system
         creation, snapshot creation, etc.
  
  - L2ARC
  
         Level 2 cache for ZFS - allows to use additional disks for cache.
         Huge performance improvements mostly for random read of mostly
         static content.
  
  - slog
  
         Allow to use additional disks for ZFS Intent Log to speed up
         operations like fsync(2).
  
  - vfs.zfs.super_owner
  
         Allows regular users to perform privileged operations on files stored
         on ZFS file systems owned by him. Very careful with this one.
  
  - chflags(2)
  
         Not all the flags are supported. This still needs work.
  
  - ZFSBoot
  
         Support to boot off of ZFS pool. Not finished, AFAIK.
  
         Submitted by:   dfr
  
  - Snapshot properties
  
  - New failure modes
  
         Before if write requested failed, system paniced. Now one
         can select from one of three failure modes:
  
         Before if write requested failed, system paniced. Now one
         can select from one of three failure modes:
         - panic - panic on write error
         - wait - wait for disk to reappear
         - continue - serve read requests if possible, block write requests
  
  - Refquota, refreservation properties
  
         Just quota and reservation properties, but don't count space consumed
         by children file systems, clones and snapshots.
  
   - Sparse volumes
  
         ZVOLs that don't reserve space in the pool.
  
   - External attributes
  
         Compatible with extattr(2).
  
   - NFSv4-ACLs
  
         Not sure about the status, might not be complete yet.
  
         Submitted by:   trasz
  
   - Creation-time properties
  
   - Regression tests for zpool(8) command.
  
   Obtained from:        OpenSolaris

Added:
  stable/7/cddl/compat/opensolaris/include/libshare.h   (contents, props changed)
  stable/7/cddl/contrib/opensolaris/cmd/zinject/
  stable/7/cddl/contrib/opensolaris/cmd/zinject/translate.c
  stable/7/cddl/contrib/opensolaris/cmd/zinject/zinject.c
  stable/7/cddl/contrib/opensolaris/cmd/zinject/zinject.h
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  stable/7/cddl/usr.bin/zinject/
  stable/7/cddl/usr.bin/zinject/Makefile   (contents, props changed)
  stable/7/sys/boot/i386/zfsboot/
  stable/7/sys/boot/i386/zfsboot/zfsboot.c   (contents, props changed)
  stable/7/sys/boot/zfs/
  stable/7/sys/boot/zfs/zfsimpl.c   (contents, props changed)
  stable/7/sys/cddl/boot/
  stable/7/sys/cddl/boot/zfs/
  stable/7/sys/cddl/boot/zfs/README   (contents, props changed)
  stable/7/sys/cddl/boot/zfs/fletcher.c   (contents, props changed)
  stable/7/sys/cddl/boot/zfs/lzjb.c   (contents, props changed)
  stable/7/sys/cddl/boot/zfs/sha256.c   (contents, props changed)
  stable/7/sys/cddl/boot/zfs/zfsimpl.h   (contents, props changed)
  stable/7/sys/cddl/boot/zfs/zfssubr.c   (contents, props changed)
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c   (contents, props changed)
  stable/7/sys/cddl/compat/opensolaris/sys/file.h   (contents, props changed)
  stable/7/sys/cddl/compat/opensolaris/sys/kidmap.h   (contents, props changed)
  stable/7/sys/cddl/compat/opensolaris/sys/pathname.h   (contents, props changed)
  stable/7/sys/cddl/compat/opensolaris/sys/refstr.h   (contents, props changed)
  stable/7/sys/cddl/compat/opensolaris/sys/sid.h   (contents, props changed)
  stable/7/sys/cddl/compat/opensolaris/sys/sig.h   (contents, props changed)
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S
  stable/7/sys/cddl/contrib/opensolaris/common/unicode/
  stable/7/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg2.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub2.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid2.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c
Deleted:
  stable/7/sys/cddl/compat/opensolaris/sys/acl.h
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S
  stable/7/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/vfs.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c
Modified:
  stable/7/UPDATING
  stable/7/cddl/Makefile.inc
  stable/7/cddl/compat/opensolaris/include/mnttab.h
  stable/7/cddl/compat/opensolaris/misc/deviceid.c
  stable/7/cddl/compat/opensolaris/misc/mnttab.c
  stable/7/cddl/compat/opensolaris/misc/zmount.c
  stable/7/cddl/compat/opensolaris/misc/zone.c
  stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  stable/7/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  stable/7/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
  stable/7/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h
  stable/7/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  stable/7/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  stable/7/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c
  stable/7/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  stable/7/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c
  stable/7/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
  stable/7/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
  stable/7/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  stable/7/cddl/contrib/opensolaris/head/assert.h
  stable/7/cddl/contrib/opensolaris/head/libintl.h
  stable/7/cddl/contrib/opensolaris/head/synch.h
  stable/7/cddl/contrib/opensolaris/head/thread.h
  stable/7/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
  stable/7/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h
  stable/7/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h
  stable/7/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h
  stable/7/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c
  stable/7/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c
  stable/7/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c
  stable/7/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
  stable/7/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  stable/7/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  stable/7/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  stable/7/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
  stable/7/cddl/contrib/opensolaris/lib/libzpool/common/util.c
  stable/7/cddl/lib/Makefile
  stable/7/cddl/lib/libnvpair/Makefile
  stable/7/cddl/lib/libzfs/Makefile
  stable/7/cddl/lib/libzpool/Makefile
  stable/7/cddl/sbin/zpool/Makefile
  stable/7/cddl/usr.bin/Makefile
  stable/7/cddl/usr.bin/ztest/Makefile
  stable/7/cddl/usr.sbin/Makefile
  stable/7/cddl/usr.sbin/zdb/Makefile
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris.c
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  stable/7/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c
  stable/7/sys/cddl/compat/opensolaris/rpc/xdr.h
  stable/7/sys/cddl/compat/opensolaris/sys/atomic.h
  stable/7/sys/cddl/compat/opensolaris/sys/cpuvar.h
  stable/7/sys/cddl/compat/opensolaris/sys/cred.h
  stable/7/sys/cddl/compat/opensolaris/sys/dnlc.h
  stable/7/sys/cddl/compat/opensolaris/sys/kmem.h
  stable/7/sys/cddl/compat/opensolaris/sys/lock.h
  stable/7/sys/cddl/compat/opensolaris/sys/misc.h
  stable/7/sys/cddl/compat/opensolaris/sys/mntent.h
  stable/7/sys/cddl/compat/opensolaris/sys/mutex.h
  stable/7/sys/cddl/compat/opensolaris/sys/param.h
  stable/7/sys/cddl/compat/opensolaris/sys/policy.h
  stable/7/sys/cddl/compat/opensolaris/sys/proc.h
  stable/7/sys/cddl/compat/opensolaris/sys/rwlock.h
  stable/7/sys/cddl/compat/opensolaris/sys/sunddi.h
  stable/7/sys/cddl/compat/opensolaris/sys/sysmacros.h
  stable/7/sys/cddl/compat/opensolaris/sys/time.h
  stable/7/sys/cddl/compat/opensolaris/sys/types.h
  stable/7/sys/cddl/compat/opensolaris/sys/uio.h
  stable/7/sys/cddl/compat/opensolaris/sys/vfs.h
  stable/7/sys/cddl/compat/opensolaris/sys/vnode.h
  stable/7/sys/cddl/compat/opensolaris/sys/zone.h
  stable/7/sys/cddl/contrib/opensolaris/common/acl/acl_common.c
  stable/7/sys/cddl/contrib/opensolaris/common/acl/acl_common.h
  stable/7/sys/cddl/contrib/opensolaris/common/avl/avl.c
  stable/7/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  stable/7/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/os/list.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c
  stable/7/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/list.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
  stable/7/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c
  stable/7/sys/compat/linprocfs/linprocfs.c
  stable/7/sys/compat/pecoff/imgact_pecoff.c
  stable/7/sys/fs/coda/coda_vfsops.c
  stable/7/sys/fs/msdosfs/msdosfs_vfsops.c
  stable/7/sys/fs/nullfs/null_vfsops.c
  stable/7/sys/fs/unionfs/union_vfsops.c
  stable/7/sys/modules/opensolaris/Makefile
  stable/7/sys/modules/zfs/Makefile
  stable/7/sys/ufs/ffs/ffs_snapshot.c
  stable/7/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c

Modified: stable/7/UPDATING
==============================================================================
--- stable/7/UPDATING	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/UPDATING	Wed May 20 23:34:59 2009	(r192498)
@@ -7,7 +7,12 @@ done items, please see the COMMON ITEMS:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
-
+20090520
+	Update ZFS to version 13. ZFS users will need to re-build
+	kernel and world. Existing pools will continue to work
+	without upgrade. If a pool is upgraded it will no longer be
+	usable by older kernel revs. ZFS send / recv between 
+	pool version 6 and pool version 13 is not supported.
 20090504:
 	FreeBSD 7.2-RELEASE
 

Modified: stable/7/cddl/Makefile.inc
==============================================================================
--- stable/7/cddl/Makefile.inc	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/Makefile.inc	Wed May 20 23:34:59 2009	(r192498)
@@ -6,3 +6,5 @@ OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../.
 IGNORE_PRAGMA=	YES
 
 CFLAGS+=	-DNEED_SOLARIS_BOOLEAN
+
+CSTD?=		gnu89

Added: stable/7/cddl/compat/opensolaris/include/libshare.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/cddl/compat/opensolaris/include/libshare.h	Wed May 20 23:34:59 2009	(r192498)
@@ -0,0 +1,144 @@
+/*-
+ * Copyright (c) 2007 Pawel Jakub Dawidek 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
+ */
+
+#ifndef _OPENSOLARIS_LIBSHARE_H_
+#define _OPENSOLARIS_LIBSHARE_H_
+
+#define	SA_OK	0
+
+#define	SA_INIT_CONTROL_API	0
+
+#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */
+/*-
+ * Copyright (c) 2007 Pawel Jakub Dawidek 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
+ */
+
+#ifndef _OPENSOLARIS_LIBSHARE_H_
+#define _OPENSOLARIS_LIBSHARE_H_
+
+#define	SA_OK	0
+
+#define	SA_INIT_CONTROL_API	0
+
+#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */
+/*-
+ * Copyright (c) 2007 Pawel Jakub Dawidek 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
+ */
+
+#ifndef _OPENSOLARIS_LIBSHARE_H_
+#define _OPENSOLARIS_LIBSHARE_H_
+
+#define	SA_OK	0
+
+#define	SA_INIT_CONTROL_API	0
+
+#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */
+/*-
+ * Copyright (c) 2007 Pawel Jakub Dawidek 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
+ */
+
+#ifndef _OPENSOLARIS_LIBSHARE_H_
+#define _OPENSOLARIS_LIBSHARE_H_
+
+#define	SA_OK	0
+
+#define	SA_INIT_CONTROL_API	0
+
+#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */

Modified: stable/7/cddl/compat/opensolaris/include/mnttab.h
==============================================================================
--- stable/7/cddl/compat/opensolaris/include/mnttab.h	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/compat/opensolaris/include/mnttab.h	Wed May 20 23:34:59 2009	(r192498)
@@ -9,6 +9,8 @@
 #define	MNTTAB		_PATH_DEVNULL
 #define	MNT_LINE_MAX	1024
 
+#define	umount2(p, f)	unmount(p, f)
+
 struct mnttab {
 	char	*mnt_special;
 	char	*mnt_mountp;

Modified: stable/7/cddl/compat/opensolaris/misc/deviceid.c
==============================================================================
--- stable/7/cddl/compat/opensolaris/misc/deviceid.c	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/compat/opensolaris/misc/deviceid.c	Wed May 20 23:34:59 2009	(r192498)
@@ -94,11 +94,7 @@ int
 devid_get(int fd, ddi_devid_t *retdevid)
 {
 
-	if (ioctl(fd, DIOCGIDENT, retdevid->devid) == -1)
-		return (errno);
-	if (retdevid->devid[0] == '\0')
-		return (ENOENT);
-	return (0);
+	return (ENOENT);
 }
 
 int

Modified: stable/7/cddl/compat/opensolaris/misc/mnttab.c
==============================================================================
--- stable/7/cddl/compat/opensolaris/misc/mnttab.c	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/compat/opensolaris/misc/mnttab.c	Wed May 20 23:34:59 2009	(r192498)
@@ -37,6 +37,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
+#include 
 
 static char *
 mntopt(char **p)

Modified: stable/7/cddl/compat/opensolaris/misc/zmount.c
==============================================================================
--- stable/7/cddl/compat/opensolaris/misc/zmount.c	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/compat/opensolaris/misc/zmount.c	Wed May 20 23:34:59 2009	(r192498)
@@ -35,9 +35,10 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
-#include 
+#include 
 
 static void
 build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val,
@@ -86,7 +87,7 @@ zmount(const char *spec, const char *dir
 	assert(optlen > 0);
 
 	optstr = strdup(optptr);
-	assert(optptr != NULL);
+	assert(optstr != NULL);
 
 	iov = NULL;
 	iovlen = 0;

Modified: stable/7/cddl/compat/opensolaris/misc/zone.c
==============================================================================
--- stable/7/cddl/compat/opensolaris/misc/zone.c	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/compat/opensolaris/misc/zone.c	Wed May 20 23:34:59 2009	(r192498)
@@ -32,7 +32,7 @@
 #include 
 #include 
 
-int
+zoneid_t
 getzoneid(void)
 {
 	size_t size;
@@ -42,5 +42,5 @@ getzoneid(void)
 	size = sizeof(jailid);
 	if (sysctlbyname("security.jail.jailed", &jailid, &size, NULL, 0) == -1)
 		assert(!"No security.jail.jailed sysctl!");
-	return (jailid);
+	return ((zoneid_t)jailid);
 }

Modified: stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Wed May 20 23:34:59 2009	(r192498)
@@ -28,13 +28,18 @@ zdb \- ZFS debugger
 .fi
 
 .SH DESCRIPTION
+.sp
 .LP
 The \fBzdb\fR command is used by support engineers to diagnose failures and gather statistics. Since the \fBZFS\fR file system is always consistent on disk and is self-repairing, \fBzdb\fR should only be run under the direction by a support engineer.
+.sp
 .LP
 If no arguments are specified, \fBzdb\fR, performs basic consistency checks on the pool and associated datasets, and report any problems detected.
+.sp
 .LP
 Any options supported by this command are internal to Sun and subject to change at any time.
 .SH EXIT STATUS
+
+.sp
 .LP
 The following exit values are returned:
 .sp
@@ -71,6 +76,9 @@ Invalid command line options were specif
 .RE
 
 .SH ATTRIBUTES
+
+.sp
+
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -89,5 +97,6 @@ Interface StabilityUnstable
 .TE
 
 .SH SEE ALSO
+.sp
 .LP
 \fBzfs\fR(1M), \fBzpool\fR(1M), \fBattributes\fR(5)

Modified: stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Wed May 20 23:33:40 2009	(r192497)
+++ stable/7/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Wed May 20 23:34:59 2009	(r192498)
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include 
 #include 
 #include 
@@ -51,6 +49,10 @@
 #include 
 #include 
 #include 
+#include 
+#undef ZFS_MAXNAMELEN
+#undef verify
+#include 
 
 const char cmdname[] = "zdb";
 uint8_t dump_opt[256];
@@ -62,6 +64,9 @@ uint64_t *zopt_object = NULL;
 int zopt_objects = 0;
 int zdb_advance = ADVANCE_PRE;
 zbookmark_t zdb_noread = { 0, 0, ZB_NO_LEVEL, 0 };
+libzfs_handle_t *g_zfs;
+boolean_t zdb_sig_user_data = B_TRUE;
+int zdb_sig_cksumalg = ZIO_CHECKSUM_SHA256;
 
 /*
  * These libumem hooks provide a reasonable set of defaults for the allocator's
@@ -83,12 +88,15 @@ static void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: %s [-udibcsvLU] [-O order] [-B os:obj:level:blkid] "
+	    "Usage: %s [-udibcsvL] [-U cachefile_path] [-O order] "
+	    "[-B os:obj:level:blkid] [-S user:cksumalg] "
 	    "dataset [object...]\n"
 	    "       %s -C [pool]\n"
 	    "       %s -l dev\n"
-	    "       %s -R vdev:offset:size:flags\n",
-	    cmdname, cmdname, cmdname, cmdname);
+	    "       %s -R pool:vdev:offset:size:flags\n"
+	    "       %s [-p path_to_vdev_dir]\n"
+	    "       %s -e pool | GUID | devid ...\n",
+	    cmdname, cmdname, cmdname, cmdname, cmdname, cmdname);
 
 	(void) fprintf(stderr, "	-u uberblock\n");
 	(void) fprintf(stderr, "	-d datasets\n");
@@ -97,16 +105,22 @@ usage(void)
 	(void) fprintf(stderr, "	-b block statistics\n");
 	(void) fprintf(stderr, "	-c checksum all data blocks\n");
 	(void) fprintf(stderr, "	-s report stats on zdb's I/O\n");
+	(void) fprintf(stderr, "	-S : -- "
+	    "dump blkptr signatures\n");
 	(void) fprintf(stderr, "	-v verbose (applies to all others)\n");
 	(void) fprintf(stderr, "        -l dump label contents\n");
 	(void) fprintf(stderr, "	-L live pool (allows some errors)\n");
 	(void) fprintf(stderr, "	-O [!] "
 	    "visitation order\n");
-	(void) fprintf(stderr, "	-U use zpool.cache in /tmp\n");
+	(void) fprintf(stderr, "	-U cachefile_path -- use alternate "
+	    "cachefile\n");
 	(void) fprintf(stderr, "	-B objset:object:level:blkid -- "
 	    "simulate bad block\n");
-	(void) fprintf(stderr, "        -R read and display block from a"
+	(void) fprintf(stderr, "        -R read and display block from a "
 	    "device\n");
+	(void) fprintf(stderr, "        -e Pool is exported/destroyed/"
+	    "has altroot\n");
+	(void) fprintf(stderr, "	-p  (use with -e)\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
 	    "to make only that option verbose\n");
 	(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
@@ -367,6 +381,44 @@ dump_zap(objset_t *os, uint64_t object, 
 	zap_cursor_fini(&zc);
 }
 
+/*ARGSUSED*/
+static void
+dump_zpldir(objset_t *os, uint64_t object, void *data, size_t size)
+{
+	zap_cursor_t zc;
+	zap_attribute_t attr;
+	const char *typenames[] = {
+		/* 0 */ "not specified",
+		/* 1 */ "FIFO",
+		/* 2 */ "Character Device",
+		/* 3 */ "3 (invalid)",
+		/* 4 */ "Directory",
+		/* 5 */ "5 (invalid)",
+		/* 6 */ "Block Device",
+		/* 7 */ "7 (invalid)",
+		/* 8 */ "Regular File",
+		/* 9 */ "9 (invalid)",
+		/* 10 */ "Symbolic Link",
+		/* 11 */ "11 (invalid)",
+		/* 12 */ "Socket",
+		/* 13 */ "Door",
+		/* 14 */ "Event Port",
+		/* 15 */ "15 (invalid)",
+	};
+
+	dump_zap_stats(os, object);
+	(void) printf("\n");
+
+	for (zap_cursor_init(&zc, os, object);
+	    zap_cursor_retrieve(&zc, &attr) == 0;
+	    zap_cursor_advance(&zc)) {
+		(void) printf("\t\t%s = %lld (type: %s)\n",
+		    attr.za_name, ZFS_DIRENT_OBJ(attr.za_first_integer),
+		    typenames[ZFS_DIRENT_TYPE(attr.za_first_integer)]);
+	}
+	zap_cursor_fini(&zc);
+}
+
 static void
 dump_spacemap(objset_t *os, space_map_obj_t *smo, space_map_t *sm)
 {
@@ -456,10 +508,7 @@ dump_metaslabs(spa_t *spa)
 	for (c = 0; c < rvd->vdev_children; c++) {
 		vd = rvd->vdev_child[c];
 
-		spa_config_enter(spa, RW_READER, FTAG);
-		(void) printf("\n    vdev %llu = %s\n\n",
-		    (u_longlong_t)vd->vdev_id, vdev_description(vd));
-		spa_config_exit(spa, FTAG);
+		(void) printf("\n    vdev %llu\n\n", (u_longlong_t)vd->vdev_id);
 
 		if (dump_opt['d'] <= 5) {
 			(void) printf("\t%10s   %10s   %5s\n",
@@ -477,7 +526,6 @@ static void
 dump_dtl(vdev_t *vd, int indent)
 {
 	avl_tree_t *t = &vd->vdev_dtl_map.sm_root;
-	spa_t *spa = vd->vdev_spa;
 	space_seg_t *ss;
 	vdev_t *pvd;
 	int c;
@@ -485,9 +533,10 @@ dump_dtl(vdev_t *vd, int indent)
 	if (indent == 0)
 		(void) printf("\nDirty time logs:\n\n");
 
-	spa_config_enter(spa, RW_READER, FTAG);
-	(void) printf("\t%*s%s\n", indent, "", vdev_description(vd));
-	spa_config_exit(spa, FTAG);
+	(void) printf("\t%*s%s\n", indent, "",
+	    vd->vdev_path ? vd->vdev_path :
+	    vd->vdev_parent ? vd->vdev_ops->vdev_op_type :
+	    spa_name(vd->vdev_spa));
 
 	for (ss = avl_first(t); ss; ss = AVL_NEXT(t, ss)) {
 		/*
@@ -670,36 +719,49 @@ dump_dsl_dir(objset_t *os, uint64_t obje
 {
 	dsl_dir_phys_t *dd = data;
 	time_t crtime;
-	char used[6], compressed[6], uncompressed[6], quota[6], resv[6];
+	char nice[6];
 
 	if (dd == NULL)
 		return;
 
-	ASSERT(size == sizeof (*dd));
+	ASSERT3U(size, >=, sizeof (dsl_dir_phys_t));
 
 	crtime = dd->dd_creation_time;
-	nicenum(dd->dd_used_bytes, used);
-	nicenum(dd->dd_compressed_bytes, compressed);
-	nicenum(dd->dd_uncompressed_bytes, uncompressed);
-	nicenum(dd->dd_quota, quota);
-	nicenum(dd->dd_reserved, resv);
-
 	(void) printf("\t\tcreation_time = %s", ctime(&crtime));
 	(void) printf("\t\thead_dataset_obj = %llu\n",
 	    (u_longlong_t)dd->dd_head_dataset_obj);
 	(void) printf("\t\tparent_dir_obj = %llu\n",
 	    (u_longlong_t)dd->dd_parent_obj);
-	(void) printf("\t\tclone_parent_obj = %llu\n",
-	    (u_longlong_t)dd->dd_clone_parent_obj);
+	(void) printf("\t\torigin_obj = %llu\n",
+	    (u_longlong_t)dd->dd_origin_obj);
 	(void) printf("\t\tchild_dir_zapobj = %llu\n",
 	    (u_longlong_t)dd->dd_child_dir_zapobj);
-	(void) printf("\t\tused_bytes = %s\n", used);
-	(void) printf("\t\tcompressed_bytes = %s\n", compressed);
-	(void) printf("\t\tuncompressed_bytes = %s\n", uncompressed);
-	(void) printf("\t\tquota = %s\n", quota);
-	(void) printf("\t\treserved = %s\n", resv);
+	nicenum(dd->dd_used_bytes, nice);
+	(void) printf("\t\tused_bytes = %s\n", nice);
+	nicenum(dd->dd_compressed_bytes, nice);
+	(void) printf("\t\tcompressed_bytes = %s\n", nice);
+	nicenum(dd->dd_uncompressed_bytes, nice);
+	(void) printf("\t\tuncompressed_bytes = %s\n", nice);
+	nicenum(dd->dd_quota, nice);
+	(void) printf("\t\tquota = %s\n", nice);
+	nicenum(dd->dd_reserved, nice);
+	(void) printf("\t\treserved = %s\n", nice);
 	(void) printf("\t\tprops_zapobj = %llu\n",
 	    (u_longlong_t)dd->dd_props_zapobj);
+	(void) printf("\t\tdeleg_zapobj = %llu\n",
+	    (u_longlong_t)dd->dd_deleg_zapobj);
+	(void) printf("\t\tflags = %llx\n",
+	    (u_longlong_t)dd->dd_flags);
+
+#define	DO(which) \
+	nicenum(dd->dd_used_breakdown[DD_USED_ ## which], nice); \
+	(void) printf("\t\tused_breakdown[" #which "] = %s\n", nice)
+	DO(HEAD);
+	DO(SNAP);
+	DO(CHILD);
+	DO(CHILD_RSRV);
+	DO(REFRSRV);
+#undef DO
 }
 
 /*ARGSUSED*/
@@ -722,7 +784,7 @@ dump_dsl_dataset(objset_t *os, uint64_t 
 	nicenum(ds->ds_unique_bytes, unique);
 	sprintf_blkptr(blkbuf, BP_SPRINTF_LEN, &ds->ds_bp);
 
-	(void) printf("\t\tdataset_obj = %llu\n",
+	(void) printf("\t\tdir_obj = %llu\n",
 	    (u_longlong_t)ds->ds_dir_obj);
 	(void) printf("\t\tprev_snap_obj = %llu\n",
 	    (u_longlong_t)ds->ds_prev_snap_obj);
@@ -749,6 +811,10 @@ dump_dsl_dataset(objset_t *os, uint64_t 
 	    (u_longlong_t)ds->ds_guid);
 	(void) printf("\t\tflags = %llx\n",
 	    (u_longlong_t)ds->ds_flags);
+	(void) printf("\t\tnext_clones_obj = %llu\n",
+	    (u_longlong_t)ds->ds_next_clones_obj);
+	(void) printf("\t\tprops_obj = %llu\n",
+	    (u_longlong_t)ds->ds_props_obj);
 	(void) printf("\t\tbp = %s\n", blkbuf);
 }
 
@@ -765,9 +831,11 @@ dump_bplist(objset_t *mos, uint64_t obje
 	if (dump_opt['d'] < 3)
 		return;
 
+	mutex_init(&bpl.bpl_lock, NULL, MUTEX_DEFAULT, NULL);
 	VERIFY(0 == bplist_open(&bpl, mos, object));
 	if (bplist_empty(&bpl)) {
 		bplist_close(&bpl);
+		mutex_destroy(&bpl.bpl_lock);
 		return;
 	}
 
@@ -785,6 +853,7 @@ dump_bplist(objset_t *mos, uint64_t obje
 
 	if (dump_opt['d'] < 5) {
 		bplist_close(&bpl);
+		mutex_destroy(&bpl.bpl_lock);
 		return;
 	}
 
@@ -800,6 +869,65 @@ dump_bplist(objset_t *mos, uint64_t obje
 	}
 
 	bplist_close(&bpl);
+	mutex_destroy(&bpl.bpl_lock);
+}
+
+static avl_tree_t idx_tree;
+static avl_tree_t domain_tree;
+static boolean_t fuid_table_loaded;
+
+static void
+fuid_table_destroy()
+{
+	if (fuid_table_loaded) {
+		zfs_fuid_table_destroy(&idx_tree, &domain_tree);
+		fuid_table_loaded = B_FALSE;
+	}
+}
+
+/*
+ * print uid or gid information.
+ * For normal POSIX id just the id is printed in decimal format.
+ * For CIFS files with FUID the fuid is printed in hex followed by
+ * the doman-rid string.
+ */
+static void
+print_idstr(uint64_t id, const char *id_type)
+{
+	if (FUID_INDEX(id)) {
+		char *domain;
+
+		domain = zfs_fuid_idx_domain(&idx_tree, FUID_INDEX(id));
+		(void) printf("\t%s     %llx [%s-%d]\n", id_type,
+		    (u_longlong_t)id, domain, (int)FUID_RID(id));
+	} else {
+		(void) printf("\t%s     %llu\n", id_type, (u_longlong_t)id);
+	}
+
+}
+
+static void
+dump_uidgid(objset_t *os, znode_phys_t *zp)
+{
+	uint32_t uid_idx, gid_idx;
+
+	uid_idx = FUID_INDEX(zp->zp_uid);
+	gid_idx = FUID_INDEX(zp->zp_gid);
+
+	/* Load domain table, if not already loaded */
+	if (!fuid_table_loaded && (uid_idx || gid_idx)) {
+		uint64_t fuid_obj;
+
+		/* first find the fuid object.  It lives in the master node */
+		VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZFS_FUID_TABLES,
+		    8, 1, &fuid_obj) == 0);
+		(void) zfs_fuid_table_load(os, fuid_obj,
+		    &idx_tree, &domain_tree);
+		fuid_table_loaded = B_TRUE;
+	}
+
+	print_idstr(zp->zp_uid, "uid");
+	print_idstr(zp->zp_gid, "gid");
 }
 
 /*ARGSUSED*/
@@ -830,6 +958,7 @@ dump_znode(objset_t *os, uint64_t object
 	z_ctime = (time_t)zp->zp_ctime[0];
 
 	(void) printf("\tpath	%s\n", path);
+	dump_uidgid(os, zp);
 	(void) printf("\tatime	%s", ctime(&z_atime));
 	(void) printf("\tmtime	%s", ctime(&z_mtime));
 	(void) printf("\tctime	%s", ctime(&z_ctime));
@@ -874,9 +1003,9 @@ static object_viewer_t *object_viewer[DM
 	dump_zap,		/* DSL props			*/
 	dump_dsl_dataset,	/* DSL dataset			*/
 	dump_znode,		/* ZFS znode			*/
-	dump_acl,		/* ZFS ACL			*/
+	dump_acl,		/* ZFS V0 ACL			*/
 	dump_uint8,		/* ZFS plain file		*/
-	dump_zap,		/* ZFS directory		*/
+	dump_zpldir,		/* ZFS directory		*/
 	dump_zap,		/* ZFS master node		*/
 	dump_zap,		/* ZFS delete queue		*/
 	dump_uint8,		/* zvol object			*/
@@ -888,6 +1017,13 @@ static object_viewer_t *object_viewer[DM
 	dump_uint8,		/* SPA history			*/
 	dump_uint64,		/* SPA history offsets		*/
 	dump_zap,		/* Pool properties		*/
+	dump_zap,		/* DSL permissions		*/
+	dump_acl,		/* ZFS ACL			*/
+	dump_uint8,		/* ZFS SYSACL			*/
+	dump_none,		/* FUID nvlist			*/
+	dump_packed_nvlist,	/* FUID nvlist size		*/
+	dump_zap,		/* DSL dataset next clones	*/
+	dump_zap,		/* DSL scrub queue		*/
 };
 
 static void
@@ -930,13 +1066,15 @@ dump_object(objset_t *os, uint64_t objec
 
 	aux[0] = '\0';
 
-	if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6)
+	if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6) {
 		(void) snprintf(aux + strlen(aux), sizeof (aux), " (K=%s)",
 		zio_checksum_table[doi.doi_checksum].ci_name);
+	}
 
-	if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6)
+	if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6) {
 		(void) snprintf(aux + strlen(aux), sizeof (aux), " (Z=%s)",
 		zio_compress_table[doi.doi_compress].ci_name);
+	}
 
 	(void) printf("%10lld  %3u  %5s  %5s  %5s  %5s  %s%s\n",
 	    (u_longlong_t)object, doi.doi_indirection, iblk, dblk, lsize,
@@ -972,13 +1110,13 @@ dump_object(objset_t *os, uint64_t objec
 		}
 
 		for (;;) {
-			error = dnode_next_offset(dn, B_FALSE, &start, minlvl,
-			    blkfill, 0);
+			error = dnode_next_offset(dn,
+			    0, &start, minlvl, blkfill, 0);
 			if (error)
 				break;
 			end = start;
-			error = dnode_next_offset(dn, B_TRUE, &end, minlvl,
-			    blkfill, 0);
+			error = dnode_next_offset(dn,
+			    DNODE_FIND_HOLE, &end, minlvl, blkfill, 0);
 			nicenum(end - start, segsize);
 			(void) printf("\t\tsegment [%016llx, %016llx)"
 			    " size %5s\n", (u_longlong_t)start,
@@ -996,7 +1134,6 @@ dump_object(objset_t *os, uint64_t objec
 static char *objset_types[DMU_OST_NUMTYPES] = {
 	"NONE", "META", "ZPL", "ZVOL", "OTHER", "ANY" };
 
-/*ARGSUSED*/
 static void
 dump_dir(objset_t *os)
 {
@@ -1019,8 +1156,8 @@ dump_dir(objset_t *os)
 	if (dds.dds_type == DMU_OST_META) {
 		dds.dds_creation_txg = TXG_INITIAL;
 		usedobjs = os->os->os_rootbp->blk_fill;
-		refdbytes =
-		    os->os->os_spa->spa_dsl_pool->dp_mos_dir->dd_used_bytes;
+		refdbytes = os->os->os_spa->spa_dsl_pool->
+		    dp_mos_dir->dd_phys->dd_used_bytes;
 	} else {
 		dmu_objset_space(os, &refdbytes, &scratch, &usedobjs, &scratch);
 	}
@@ -1054,6 +1191,9 @@ dump_dir(objset_t *os)
 	if (verbosity < 2)
 		return;
 
+	if (os->os->os_rootbp->blk_birth == 0)
+		return;
+
 	if (zopt_objects != 0) {
 		for (i = 0; i < zopt_objects; i++)
 			dump_object(os, zopt_object[i], verbosity,
@@ -1115,6 +1255,52 @@ dump_config(const char *pool)
 }
 
 static void
+dump_cachefile(const char *cachefile)
+{
+	int fd;
+	struct stat64 statbuf;
+	char *buf;
+	nvlist_t *config;
+
+	if ((fd = open64(cachefile, O_RDONLY)) < 0) {
+		(void) printf("cannot open '%s': %s\n", cachefile,
+		    strerror(errno));
+		exit(1);
+	}
+
+	if (fstat64(fd, &statbuf) != 0) {
+		(void) printf("failed to stat '%s': %s\n", cachefile,
+		    strerror(errno));
+		exit(1);
+	}
+
+	if ((buf = malloc(statbuf.st_size)) == NULL) {
+		(void) fprintf(stderr, "failed to allocate %llu bytes\n",
+		    (u_longlong_t)statbuf.st_size);
+		exit(1);
+	}
+
+	if (read(fd, buf, statbuf.st_size) != statbuf.st_size) {
+		(void) fprintf(stderr, "failed to read %llu bytes\n",
+		    (u_longlong_t)statbuf.st_size);
+		exit(1);
+	}
+
+	(void) close(fd);
+
+	if (nvlist_unpack(buf, statbuf.st_size, &config, 0) != 0) {
+		(void) fprintf(stderr, "failed to unpack nvlist\n");
+		exit(1);
+	}
+
+	free(buf);
+
+	dump_nvlist(config, 0);
+
+	nvlist_free(config);
+}
+
+static void
 dump_label(const char *dev)
 {
 	int fd;
@@ -1178,170 +1364,84 @@ dump_one_dir(char *dsname, void *arg)
 	objset_t *os;
 
 	error = dmu_objset_open(dsname, DMU_OST_ANY,
-	    DS_MODE_STANDARD | DS_MODE_READONLY, &os);
+	    DS_MODE_USER | DS_MODE_READONLY, &os);
 	if (error) {
 		(void) printf("Could not open %s\n", dsname);
 		return (0);
 	}
 	dump_dir(os);
 	dmu_objset_close(os);
+	fuid_table_destroy();
 	return (0);
 }
 
 static void
-zdb_space_map_load(spa_t *spa)
+zdb_leak(space_map_t *sm, uint64_t start, uint64_t size)
 {
-	vdev_t *rvd = spa->spa_root_vdev;
-	vdev_t *vd;
-	int c, m, error;
+	vdev_t *vd = sm->sm_ppd;
 
-	for (c = 0; c < rvd->vdev_children; c++) {
-		vd = rvd->vdev_child[c];
-		for (m = 0; m < vd->vdev_ms_count; m++) {
-			metaslab_t *msp = vd->vdev_ms[m];
-			mutex_enter(&msp->ms_lock);
-			error = space_map_load(&msp->ms_allocmap[0], NULL,
-			    SM_ALLOC, &msp->ms_smo, spa->spa_meta_objset);
-			mutex_exit(&msp->ms_lock);
-			if (error)
-				fatal("%s bad space map #%d, error %d",
-				    spa->spa_name, c, error);
-		}
-	}
+	(void) printf("leaked space: vdev %llu, offset 0x%llx, size %llu\n",
+	    (u_longlong_t)vd->vdev_id, (u_longlong_t)start, (u_longlong_t)size);
 }
 
-static int
-zdb_space_map_claim(spa_t *spa, blkptr_t *bp, zbookmark_t *zb)
+/* ARGSUSED */
+static void
+zdb_space_map_load(space_map_t *sm)
 {
-	dva_t *dva = bp->blk_dva;
-	vdev_t *vd;
-	metaslab_t *msp;
-	space_map_t *allocmap, *freemap;
-	int error;
-	int d;
-	blkptr_t blk = *bp;
-
-	for (d = 0; d < BP_GET_NDVAS(bp); d++) {
-		uint64_t vdev = DVA_GET_VDEV(&dva[d]);
-		uint64_t offset = DVA_GET_OFFSET(&dva[d]);
-		uint64_t size = DVA_GET_ASIZE(&dva[d]);
-
-		if ((vd = vdev_lookup_top(spa, vdev)) == NULL)
-			return (ENXIO);
-
-		if ((offset >> vd->vdev_ms_shift) >= vd->vdev_ms_count)
-			return (ENXIO);
-
-		msp = vd->vdev_ms[offset >> vd->vdev_ms_shift];
-		allocmap = &msp->ms_allocmap[0];
-		freemap = &msp->ms_freemap[0];
-
-		/* Prepare our copy of the bp in case we need to read GBHs */
-		if (DVA_GET_GANG(&dva[d])) {
-			size = vdev_psize_to_asize(vd, SPA_GANGBLOCKSIZE);
-			DVA_SET_ASIZE(&blk.blk_dva[d], size);
-			DVA_SET_GANG(&blk.blk_dva[d], 0);
-		}
-
-		mutex_enter(&msp->ms_lock);
-		if (space_map_contains(freemap, offset, size)) {
-			mutex_exit(&msp->ms_lock);
-			return (EAGAIN);	/* allocated more than once */
-		}
-
-		if (!space_map_contains(allocmap, offset, size)) {
-			mutex_exit(&msp->ms_lock);
-			return (ESTALE);	/* not allocated at all */
-		}
-
-		space_map_remove(allocmap, offset, size);
-		space_map_add(freemap, offset, size);
-
-		mutex_exit(&msp->ms_lock);
-	}
-
-	if (BP_IS_GANG(bp)) {
-		zio_gbh_phys_t gbh;
-		int g;
-
-		/* LINTED - compile time assert */
-		ASSERT(sizeof (zio_gbh_phys_t) == SPA_GANGBLOCKSIZE);
-
-		BP_SET_CHECKSUM(&blk, ZIO_CHECKSUM_GANG_HEADER);
-		BP_SET_PSIZE(&blk, SPA_GANGBLOCKSIZE);
-		BP_SET_LSIZE(&blk, SPA_GANGBLOCKSIZE);
-		BP_SET_COMPRESS(&blk, ZIO_COMPRESS_OFF);
-		error = zio_wait(zio_read(NULL, spa, &blk, &gbh,
-		    SPA_GANGBLOCKSIZE, NULL, NULL, ZIO_PRIORITY_SYNC_READ,
-		    ZIO_FLAG_CANFAIL | ZIO_FLAG_CONFIG_HELD, zb));
-		if (error)
-			return (error);
-		if (BP_SHOULD_BYTESWAP(&blk))
-			byteswap_uint64_array(&gbh, SPA_GANGBLOCKSIZE);
-		for (g = 0; g < SPA_GBH_NBLKPTRS; g++) {
-			if (BP_IS_HOLE(&gbh.zg_blkptr[g]))
-				break;
-			error = zdb_space_map_claim(spa, &gbh.zg_blkptr[g], zb);
-			if (error)
-				return (error);
-		}
-	}
-
-	return (0);
 }
 
 static void
-zdb_leak(space_map_t *sm, uint64_t start, uint64_t size)
+zdb_space_map_unload(space_map_t *sm)
 {
-	metaslab_t *msp;
-
-	/* LINTED */
-	msp = (metaslab_t *)((char *)sm - offsetof(metaslab_t, ms_allocmap[0]));
+	space_map_vacate(sm, zdb_leak, sm);
+}
 
-	(void) printf("leaked space: vdev %llu, offset 0x%llx, size %llu\n",
-	    (u_longlong_t)msp->ms_group->mg_vd->vdev_id,
-	    (u_longlong_t)start,
-	    (u_longlong_t)size);
+/* ARGSUSED */
+static void
+zdb_space_map_claim(space_map_t *sm, uint64_t start, uint64_t size)
+{
 }
 
+static space_map_ops_t zdb_space_map_ops = {
+	zdb_space_map_load,
+	zdb_space_map_unload,
+	NULL,	/* alloc */
+	zdb_space_map_claim,
+	NULL	/* free */
+};
+
 static void
-zdb_space_map_unload(spa_t *spa)
+zdb_leak_init(spa_t *spa)
 {
 	vdev_t *rvd = spa->spa_root_vdev;
-	vdev_t *vd;
-	int c, m;
 
-	for (c = 0; c < rvd->vdev_children; c++) {
-		vd = rvd->vdev_child[c];
-		for (m = 0; m < vd->vdev_ms_count; m++) {
+	for (int c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *vd = rvd->vdev_child[c];
+		for (int m = 0; m < vd->vdev_ms_count; m++) {
 			metaslab_t *msp = vd->vdev_ms[m];
 			mutex_enter(&msp->ms_lock);
-			space_map_vacate(&msp->ms_allocmap[0], zdb_leak,
-			    &msp->ms_allocmap[0]);
-			space_map_unload(&msp->ms_allocmap[0]);
-			space_map_vacate(&msp->ms_freemap[0], NULL, NULL);
+			VERIFY(space_map_load(&msp->ms_map, &zdb_space_map_ops,
+			    SM_ALLOC, &msp->ms_smo, spa->spa_meta_objset) == 0);
+			msp->ms_map.sm_ppd = vd;
 			mutex_exit(&msp->ms_lock);
 		}
 	}
 }
 
 static void
-zdb_refresh_ubsync(spa_t *spa)
+zdb_leak_fini(spa_t *spa)
 {
-	uberblock_t ub = { 0 };
 	vdev_t *rvd = spa->spa_root_vdev;
-	zio_t *zio;
-
-	/*
-	 * Reload the uberblock.
-	 */
-	zio = zio_root(spa, NULL, NULL,
-	    ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE);
-	vdev_uberblock_load(zio, rvd, &ub);
-	(void) zio_wait(zio);
 
-	if (ub.ub_txg != 0)
-		spa->spa_ubsync = ub;
+	for (int c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *vd = rvd->vdev_child[c];
+		for (int m = 0; m < vd->vdev_ms_count; m++) {
+			metaslab_t *msp = vd->vdev_ms[m];
+			mutex_enter(&msp->ms_lock);
+			space_map_unload(&msp->ms_map);
+			mutex_exit(&msp->ms_lock);
+		}
+	}
 }
 
 /*
@@ -1371,9 +1471,7 @@ typedef struct zdb_cb {
 static void
 zdb_count_block(spa_t *spa, zdb_cb_t *zcb, blkptr_t *bp, int type)
 {
-	int i, error;
-
-	for (i = 0; i < 4; i++) {
+	for (int i = 0; i < 4; i++) {
 		int l = (i < 2) ? BP_GET_LEVEL(bp) : ZB_TOTAL;
 		int t = (i & 1) ? type : DMU_OT_TOTAL;
 		zdb_blkstats_t *zb = &zcb->zcb_type[l][t];
@@ -1384,21 +1482,34 @@ zdb_count_block(spa_t *spa, zdb_cb_t *zc
 		zb->zb_count++;
 	}
 
-	if (dump_opt['L'])
-		return;
+	if (dump_opt['S']) {

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From brd at FreeBSD.org  Thu May 21 02:18:12 2009
From: brd at FreeBSD.org (Brad Davis)
Date: Thu May 21 02:18:19 2009
Subject: svn commit: r192507 - stable/7
Message-ID: <200905210218.n4L2IB3V051334@svn.freebsd.org>

Author: brd (doc committer)
Date: Thu May 21 02:18:10 2009
New Revision: 192507
URL: http://svn.freebsd.org/changeset/base/192507

Log:
  Add some missing blank lines.
  
  Approved by:	kmacy@

Modified:
  stable/7/UPDATING

Modified: stable/7/UPDATING
==============================================================================
--- stable/7/UPDATING	Thu May 21 02:12:10 2009	(r192506)
+++ stable/7/UPDATING	Thu May 21 02:18:10 2009	(r192507)
@@ -7,12 +7,14 @@ done items, please see the COMMON ITEMS:
 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
+
 20090520
 	Update ZFS to version 13. ZFS users will need to re-build
 	kernel and world. Existing pools will continue to work
 	without upgrade. If a pool is upgraded it will no longer be
 	usable by older kernel revs. ZFS send / recv between 
 	pool version 6 and pool version 13 is not supported.
+
 20090504:
 	FreeBSD 7.2-RELEASE
 
From ru at FreeBSD.org  Thu May 21 04:49:03 2009
From: ru at FreeBSD.org (Ruslan Ermilov)
Date: Thu May 21 04:49:21 2009
Subject: svn commit: r192521 - stable/7/usr.bin/ncal
Message-ID: <200905210449.n4L4n3O8055004@svn.freebsd.org>

Author: ru
Date: Thu May 21 04:49:02 2009
New Revision: 192521
URL: http://svn.freebsd.org/changeset/base/192521

Log:
  Fixed multi-byte character support to actually work.

Modified:
  stable/7/usr.bin/ncal/   (props changed)
  stable/7/usr.bin/ncal/ncal.c

Modified: stable/7/usr.bin/ncal/ncal.c
==============================================================================
--- stable/7/usr.bin/ncal/ncal.c	Thu May 21 04:44:21 2009	(r192520)
+++ stable/7/usr.bin/ncal/ncal.c	Thu May 21 04:49:02 2009	(r192521)
@@ -423,7 +423,7 @@ printmonth(int y, int m, int jd_flag)
 	mkweekdays(&wds);
 	printf("    %ls %d\n", month.name, y);
 	for (i = 0; i != 7; i++)
-		printf("%.2ls%s\n", wds.names[i], month.lines[i]);
+		wprintf(L"%.2ls%s\n", wds.names[i], month.lines[i]);
 	if (flag_weeks)
 		printf("  %s\n", month.weeks);
 }
@@ -479,17 +479,17 @@ printyear(int y, int jd_flag)
 	printf("%s\n", center(t, s, mpl * mw));
 
 	for (j = 0; j != 12; j += mpl) {
-		printf("    %-*ls%-*ls",
+		wprintf(L"    %-*ls%-*ls",
 		    mw, year[j].name,
 		    mw, year[j + 1].name);
 		if (mpl == 3)
 			printf("%ls\n", year[j + 2].name);
 		else
-			printf("%-*ls%ls\n",
+			wprintf(L"%-*ls%ls\n",
 		    	    mw, year[j + 2].name,
 		    	    year[j + 3].name);
 		for (i = 0; i != 7; i++) {
-			printf("%.2ls%-*s%-*s",
+			wprintf(L"%.2ls%-*s%-*s",
 			    wds.names[i],
 			    mw, year[j].lines[i],
 			    mw, year[j + 1].lines[i]);
@@ -537,11 +537,11 @@ printyearb(int y, int jd_flag)
 	printf("%s\n\n", center(t, s, mw * mpl + mpl));
 
 	for (j = 0; j != 12; j += mpl) {
-		printf("%-*ls  ", mw, wcenter(ws, year[j].name, mw));
+		wprintf(L"%-*ls  ", mw, wcenter(ws, year[j].name, mw));
 		if (mpl == 2)
 			printf("%ls\n", wcenter(ws, year[j + 1].name, mw));
 		else
-			printf("%-*ls  %ls\n", mw,
+			wprintf(L"%-*ls  %ls\n", mw,
 			    wcenter(ws, year[j + 1].name, mw),
 			    wcenter(wt, year[j + 2].name, mw));
 
From kmacy at FreeBSD.org  Thu May 21 05:38:52 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Thu May 21 05:39:03 2009
Subject: svn commit: r192522 - stable/7/cddl/compat/opensolaris/include
Message-ID: <200905210538.n4L5coeY056074@svn.freebsd.org>

Author: kmacy
Date: Thu May 21 05:38:50 2009
New Revision: 192522
URL: http://svn.freebsd.org/changeset/base/192522

Log:
  remove duplicate patching

Modified:
  stable/7/cddl/compat/opensolaris/include/libshare.h

Modified: stable/7/cddl/compat/opensolaris/include/libshare.h
==============================================================================
--- stable/7/cddl/compat/opensolaris/include/libshare.h	Thu May 21 04:49:02 2009	(r192521)
+++ stable/7/cddl/compat/opensolaris/include/libshare.h	Thu May 21 05:38:50 2009	(r192522)
@@ -34,111 +34,3 @@
 #define	SA_INIT_CONTROL_API	0
 
 #endif	/* !_OPENSOLARIS_LIBSHARE_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_LIBSHARE_H_
-#define _OPENSOLARIS_LIBSHARE_H_
-
-#define	SA_OK	0
-
-#define	SA_INIT_CONTROL_API	0
-
-#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_LIBSHARE_H_
-#define _OPENSOLARIS_LIBSHARE_H_
-
-#define	SA_OK	0
-
-#define	SA_INIT_CONTROL_API	0
-
-#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_LIBSHARE_H_
-#define _OPENSOLARIS_LIBSHARE_H_
-
-#define	SA_OK	0
-
-#define	SA_INIT_CONTROL_API	0
-
-#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */
From kmacy at FreeBSD.org  Thu May 21 05:58:30 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Thu May 21 05:58:49 2009
Subject: svn commit: r192523 - stable/7/sys/cddl/compat/opensolaris/sys
Message-ID: <200905210558.n4L5wU09056549@svn.freebsd.org>

Author: kmacy
Date: Thu May 21 05:58:29 2009
New Revision: 192523
URL: http://svn.freebsd.org/changeset/base/192523

Log:
  remove duplicated file contents
  
  Reported by: pluknet@gmail.com

Modified:
  stable/7/sys/cddl/compat/opensolaris/sys/file.h
  stable/7/sys/cddl/compat/opensolaris/sys/kidmap.h
  stable/7/sys/cddl/compat/opensolaris/sys/pathname.h

Modified: stable/7/sys/cddl/compat/opensolaris/sys/file.h
==============================================================================
--- stable/7/sys/cddl/compat/opensolaris/sys/file.h	Thu May 21 05:38:50 2009	(r192522)
+++ stable/7/sys/cddl/compat/opensolaris/sys/file.h	Thu May 21 05:58:29 2009	(r192523)
@@ -55,174 +55,3 @@ releasef(file_t *fp)
 #endif	/* _KERNEL */
 
 #endif	/* !_OPENSOLARIS_SYS_FILE_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_FILE_H_
-#define	_OPENSOLARIS_SYS_FILE_H_
-
-#include_next 
-
-#ifdef _KERNEL
-typedef	struct file	file_t;
-
-static __inline file_t *
-getf(int fd, int write)
-{
-	struct file *fp;
-
-	if (write && fget_write(curthread, fd, &fp) == 0)
-		return (fp);
-	else if (!write && fget_read(curthread, fd, &fp) == 0)
-		return (fp);
-	return (NULL);
-}
-
-static __inline void
-releasef(file_t *fp)
-{
-
-	fdrop(fp, curthread);
-}
-#endif	/* _KERNEL */
-
-#endif	/* !_OPENSOLARIS_SYS_FILE_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_FILE_H_
-#define	_OPENSOLARIS_SYS_FILE_H_
-
-#include_next 
-
-#ifdef _KERNEL
-typedef	struct file	file_t;
-
-static __inline file_t *
-getf(int fd, int write)
-{
-	struct file *fp;
-
-	if (write && fget_write(curthread, fd, &fp) == 0)
-		return (fp);
-	else if (!write && fget_read(curthread, fd, &fp) == 0)
-		return (fp);
-	return (NULL);
-}
-
-static __inline void
-releasef(file_t *fp)
-{
-
-	fdrop(fp, curthread);
-}
-#endif	/* _KERNEL */
-
-#endif	/* !_OPENSOLARIS_SYS_FILE_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_FILE_H_
-#define	_OPENSOLARIS_SYS_FILE_H_
-
-#include_next 
-
-#ifdef _KERNEL
-typedef	struct file	file_t;
-
-static __inline file_t *
-getf(int fd, int write)
-{
-	struct file *fp;
-
-	if (write && fget_write(curthread, fd, &fp) == 0)
-		return (fp);
-	else if (!write && fget_read(curthread, fd, &fp) == 0)
-		return (fp);
-	return (NULL);
-}
-
-static __inline void
-releasef(file_t *fp)
-{
-
-	fdrop(fp, curthread);
-}
-#endif	/* _KERNEL */
-
-#endif	/* !_OPENSOLARIS_SYS_FILE_H_ */

Modified: stable/7/sys/cddl/compat/opensolaris/sys/kidmap.h
==============================================================================
--- stable/7/sys/cddl/compat/opensolaris/sys/kidmap.h	Thu May 21 05:38:50 2009	(r192522)
+++ stable/7/sys/cddl/compat/opensolaris/sys/kidmap.h	Thu May 21 05:58:29 2009	(r192523)
@@ -39,126 +39,3 @@ typedef void	idmap_get_handle_t;
 #define	kidmap_get_mappings(hdl)	(NULL)
 
 #endif	/* _OPENSOLARIS_SYS_KIDMAP_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_KIDMAP_H_
-#define	_OPENSOLARIS_SYS_KIDMAP_H_
-
-#include 
-
-typedef int32_t	idmap_stat;
-typedef void	idmap_get_handle_t;
-
-#define	kidmap_get_create()		(NULL)
-#define	kidmap_get_destroy(hdl)		do { } while (0)
-#define	kidmap_get_mappings(hdl)	(NULL)
-
-#endif	/* _OPENSOLARIS_SYS_KIDMAP_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_KIDMAP_H_
-#define	_OPENSOLARIS_SYS_KIDMAP_H_
-
-#include 
-
-typedef int32_t	idmap_stat;
-typedef void	idmap_get_handle_t;
-
-#define	kidmap_get_create()		(NULL)
-#define	kidmap_get_destroy(hdl)		do { } while (0)
-#define	kidmap_get_mappings(hdl)	(NULL)
-
-#endif	/* _OPENSOLARIS_SYS_KIDMAP_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_KIDMAP_H_
-#define	_OPENSOLARIS_SYS_KIDMAP_H_
-
-#include 
-
-typedef int32_t	idmap_stat;
-typedef void	idmap_get_handle_t;
-
-#define	kidmap_get_create()		(NULL)
-#define	kidmap_get_destroy(hdl)		do { } while (0)
-#define	kidmap_get_mappings(hdl)	(NULL)
-
-#endif	/* _OPENSOLARIS_SYS_KIDMAP_H_ */

Modified: stable/7/sys/cddl/compat/opensolaris/sys/pathname.h
==============================================================================
--- stable/7/sys/cddl/compat/opensolaris/sys/pathname.h	Thu May 21 05:38:50 2009	(r192522)
+++ stable/7/sys/cddl/compat/opensolaris/sys/pathname.h	Thu May 21 05:58:29 2009	(r192523)
@@ -52,165 +52,3 @@ int traverse(vnode_t **, int);
 #endif	/* _KERNEL */
 
 #endif	/* _OPENSOLARIS_SYS_PATHNAME_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_PATHNAME_H_
-#define	_OPENSOLARIS_SYS_PATHNAME_H_
-
-#ifdef _KERNEL
-
-#include 
-#include 
-
-typedef struct pathname {
-	char	*pn_buf;		/* underlying storage */
-	char	*pn_path;		/* remaining pathname */
-	size_t	pn_pathlen;		/* remaining length */
-	size_t	pn_bufsize;		/* total size of pn_buf */
-} pathname_t;
-
-#define	pn_alloc(pnp)	panic("pn_alloc() called")
-#define	pn_free(pnp)	panic("pn_free() called")
-
-int lookupname(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **);
-int lookupnameat(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **,
-    vnode_t *);
-int traverse(vnode_t **, int);
-
-#endif	/* _KERNEL */
-
-#endif	/* _OPENSOLARIS_SYS_PATHNAME_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_PATHNAME_H_
-#define	_OPENSOLARIS_SYS_PATHNAME_H_
-
-#ifdef _KERNEL
-
-#include 
-#include 
-
-typedef struct pathname {
-	char	*pn_buf;		/* underlying storage */
-	char	*pn_path;		/* remaining pathname */
-	size_t	pn_pathlen;		/* remaining length */
-	size_t	pn_bufsize;		/* total size of pn_buf */
-} pathname_t;
-
-#define	pn_alloc(pnp)	panic("pn_alloc() called")
-#define	pn_free(pnp)	panic("pn_free() called")
-
-int lookupname(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **);
-int lookupnameat(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **,
-    vnode_t *);
-int traverse(vnode_t **, int);
-
-#endif	/* _KERNEL */
-
-#endif	/* _OPENSOLARIS_SYS_PATHNAME_H_ */
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek 
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (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$
- */
-
-#ifndef _OPENSOLARIS_SYS_PATHNAME_H_
-#define	_OPENSOLARIS_SYS_PATHNAME_H_
-
-#ifdef _KERNEL
-
-#include 
-#include 
-
-typedef struct pathname {
-	char	*pn_buf;		/* underlying storage */
-	char	*pn_path;		/* remaining pathname */
-	size_t	pn_pathlen;		/* remaining length */
-	size_t	pn_bufsize;		/* total size of pn_buf */
-} pathname_t;
-
-#define	pn_alloc(pnp)	panic("pn_alloc() called")
-#define	pn_free(pnp)	panic("pn_free() called")
-
-int lookupname(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **);
-int lookupnameat(char *, enum uio_seg, enum symfollow, vnode_t **, vnode_t **,
-    vnode_t *);
-int traverse(vnode_t **, int);
-
-#endif	/* _KERNEL */
-
-#endif	/* _OPENSOLARIS_SYS_PATHNAME_H_ */
From ed at FreeBSD.org  Thu May 21 10:03:51 2009
From: ed at FreeBSD.org (Ed Schouten)
Date: Thu May 21 10:04:09 2009
Subject: svn commit: r192529 - stable/7
Message-ID: <200905211003.n4LA3olo061679@svn.freebsd.org>

Author: ed
Date: Thu May 21 10:03:50 2009
New Revision: 192529
URL: http://svn.freebsd.org/changeset/base/192529

Log:
  Add missing colon.

Modified:
  stable/7/UPDATING

Modified: stable/7/UPDATING
==============================================================================
--- stable/7/UPDATING	Thu May 21 09:45:47 2009	(r192528)
+++ stable/7/UPDATING	Thu May 21 10:03:50 2009	(r192529)
@@ -8,7 +8,7 @@ Items affecting the ports and packages s
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
-20090520
+20090520:
 	Update ZFS to version 13. ZFS users will need to re-build
 	kernel and world. Existing pools will continue to work
 	without upgrade. If a pool is upgraded it will no longer be
From jhb at FreeBSD.org  Thu May 21 14:51:33 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Thu May 21 14:51:44 2009
Subject: svn commit: r192538 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905211451.n4LEpWDu069827@svn.freebsd.org>

Author: jhb
Date: Thu May 21 14:51:31 2009
New Revision: 192538
URL: http://svn.freebsd.org/changeset/base/192538

Log:
  MFC: Use a separate sx lock to try to limit wiring too much user memory for
  userland sysctl requests.  "Small" userland requests can now run
  concurrently.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_sysctl.c

Modified: stable/7/sys/kern/kern_sysctl.c
==============================================================================
--- stable/7/sys/kern/kern_sysctl.c	Thu May 21 14:43:12 2009	(r192537)
+++ stable/7/sys/kern/kern_sysctl.c	Thu May 21 14:51:31 2009	(r192538)
@@ -76,11 +76,12 @@ static MALLOC_DEFINE(M_SYSCTLTMP, "sysct
  * API rather than using the dynamic API.  Use of the dynamic API is
  * strongly encouraged for most code.
  *
- * This lock is also used to serialize userland sysctl requests.  Some
- * sysctls wire user memory, and serializing the requests limits the
- * amount of wired user memory in use.
+ * The sysctlmemlock is used to limit the amount of user memory wired for
+ * sysctl requests.  This is implemented by serializing any userland
+ * sysctl requests larger than a single page via an exclusive lock.
  */
 static struct sx sysctllock;
+static struct sx sysctlmemlock;
 
 #define	SYSCTL_SLOCK()		sx_slock(&sysctllock)
 #define	SYSCTL_SUNLOCK()	sx_sunlock(&sysctllock)
@@ -542,6 +543,7 @@ sysctl_register_all(void *arg)
 {
 	struct sysctl_oid **oidp;
 
+	sx_init(&sysctlmemlock, "sysctl mem");
 	SYSCTL_INIT();
 	SYSCTL_XLOCK();
 	SET_FOREACH(oidp, sysctl_set)
@@ -1466,7 +1468,7 @@ userland_sysctl(struct thread *td, int *
     size_t *oldlenp, int inkernel, void *new, size_t newlen, size_t *retval,
     int flags)
 {
-	int error = 0;
+	int error = 0, memlocked;
 	struct sysctl_req req;
 
 	bzero(&req, sizeof req);
@@ -1506,13 +1508,19 @@ userland_sysctl(struct thread *td, int *
 	if (KTRPOINT(curthread, KTR_SYSCTL))
 		ktrsysctl(name, namelen);
 #endif
-	
-	SYSCTL_XLOCK();
+
+	if (req.oldlen > PAGE_SIZE) {
+		memlocked = 1;
+		sx_xlock(&sysctlmemlock);
+	} else
+		memlocked = 0;
 
 	for (;;) {
 		req.oldidx = 0;
 		req.newidx = 0;
+		SYSCTL_SLOCK();
 		error = sysctl_root(0, name, namelen, &req);
+		SYSCTL_SUNLOCK();
 		if (error != EAGAIN)
 			break;
 		uio_yield();
@@ -1521,7 +1529,8 @@ userland_sysctl(struct thread *td, int *
 
 	if (req.lock == REQ_WIRED && req.validlen > 0)
 		vsunlock(req.oldptr, req.validlen);
-	SYSCTL_XUNLOCK();
+	if (memlocked)
+		sx_xunlock(&sysctlmemlock);
 
 	if (error && error != ENOMEM)
 		return (error);
From rpaulo at FreeBSD.org  Thu May 21 17:09:25 2009
From: rpaulo at FreeBSD.org (Rui Paulo)
Date: Thu May 21 17:09:32 2009
Subject: svn commit: r192548 - in stable/7/sys: . conf contrib/pf
	dev/amdtemp dev/ath/ath_hal dev/cxgb dev/k8temp modules
	modules/amdtemp modules/k8temp
Message-ID: <200905211709.n4LH9O6G073003@svn.freebsd.org>

Author: rpaulo
Date: Thu May 21 17:09:23 2009
New Revision: 192548
URL: http://svn.freebsd.org/changeset/base/192548

Log:
  MFC 189748, 189768, 189769, 189774:
    Rename k8temp to amdtemp and add support for the 10h and 11h families.

Added:
  stable/7/sys/dev/amdtemp/
     - copied from r189768, head/sys/dev/amdtemp/
  stable/7/sys/modules/amdtemp/
     - copied from r189768, head/sys/modules/amdtemp/
Deleted:
  stable/7/sys/dev/k8temp/
  stable/7/sys/modules/k8temp/
Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/conf/files.amd64
  stable/7/sys/conf/files.i386
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/amdtemp/amdtemp.c
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/modules/Makefile

Modified: stable/7/sys/conf/files.amd64
==============================================================================
--- stable/7/sys/conf/files.amd64	Thu May 21 17:01:38 2009	(r192547)
+++ stable/7/sys/conf/files.amd64	Thu May 21 17:09:23 2009	(r192548)
@@ -131,6 +131,7 @@ amd64/pci/pci_cfgreg.c		optional	pci
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/acpica/acpi_if.m		standard
+dev/amdtemp/amdtemp.c		optional	amdtemp
 dev/arcmsr/arcmsr.c		optional	arcmsr pci
 dev/atkbdc/atkbd.c		optional	atkbd atkbdc
 dev/atkbdc/atkbd_atkbdc.c	optional	atkbd atkbdc
@@ -178,7 +179,6 @@ dev/hptrr/hptrr_config.c	optional	hptrr
 dev/hwpmc/hwpmc_amd.c		optional	hwpmc
 dev/hwpmc/hwpmc_piv.c		optional	hwpmc
 dev/hwpmc/hwpmc_x86.c		optional	hwpmc
-dev/k8temp/k8temp.c		optional	k8temp
 dev/kbd/kbd.c			optional	atkbd | sc | ukbd
 dev/mem/memutil.c		optional	mem
 dev/nfe/if_nfe.c		optional	nfe pci

Modified: stable/7/sys/conf/files.i386
==============================================================================
--- stable/7/sys/conf/files.i386	Thu May 21 17:01:38 2009	(r192547)
+++ stable/7/sys/conf/files.i386	Thu May 21 17:09:23 2009	(r192548)
@@ -132,6 +132,7 @@ crypto/via/padlock_cipher.c	optional pad
 crypto/via/padlock_hash.c	optional padlock
 dev/advansys/adv_isa.c		optional adv isa
 dev/aic/aic_isa.c		optional aic isa
+dev/amdtemp/amdtemp.c		optional amdtemp
 dev/arcmsr/arcmsr.c		optional arcmsr pci
 dev/ar/if_ar.c			optional ar
 dev/ar/if_ar_isa.c		optional ar isa

Modified: stable/7/sys/dev/amdtemp/amdtemp.c
==============================================================================
--- head/sys/dev/amdtemp/amdtemp.c	Fri Mar 13 16:08:08 2009	(r189768)
+++ stable/7/sys/dev/amdtemp/amdtemp.c	Thu May 21 17:09:23 2009	(r192548)
@@ -1,5 +1,6 @@
 /*-
- * Copyright (c) 2008 Rui Paulo 
+ * Copyright (c) 2008, 2009 Rui Paulo 
+ * Copyright (c) 2009 Norikatsu Shigemura 
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,8 +26,8 @@
  */
 
 /*
- * Driver for the AMD K8 thermal sensors. Based on a Linux driver by the
- * same name.
+ * Driver for the AMD K8/K10/K11 thermal sensors. Initially based on the
+ * k8temp Linux driver.
  */
 
 #include 
@@ -48,77 +49,92 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-struct k8temp_softc {
+typedef enum {
+	SENSOR0_CORE0,
+	SENSOR0_CORE1,
+	SENSOR1_CORE0,
+	SENSOR1_CORE1,
+	CORE0,
+	CORE1
+} amdsensor_t;
+
+struct amdtemp_softc {
 	device_t	sc_dev;
 	int		sc_temps[4];
 	int		sc_ntemps;
 	struct sysctl_oid *sc_oid;
 	struct sysctl_oid *sc_sysctl_cpu[2];
 	struct intr_config_hook sc_ich;
+	int32_t (*sc_gettemp)(device_t, amdsensor_t);
 };
 
 #define VENDORID_AMD		0x1022
-#define DEVICEID_AMD_MISC	0x1103
-
-static struct k8temp_product {
-	uint16_t	k8temp_vendorid;
-	uint16_t	k8temp_deviceid;
-} k8temp_products[] = {
-	{ VENDORID_AMD,	DEVICEID_AMD_MISC },
+#define DEVICEID_AMD_MISC0F	0x1103
+#define DEVICEID_AMD_MISC10	0x1203
+#define DEVICEID_AMD_MISC11	0x1303
+
+static struct amdtemp_product {
+	uint16_t	amdtemp_vendorid;
+	uint16_t	amdtemp_deviceid;
+} amdtemp_products[] = {
+	{ VENDORID_AMD,	DEVICEID_AMD_MISC0F },
+	{ VENDORID_AMD,	DEVICEID_AMD_MISC10 },
+	{ VENDORID_AMD,	DEVICEID_AMD_MISC11 },
 	{ 0, 0 }
 };
 
 /*
- * Register control
+ * Register control (K8 family)
  */
-#define	K8TEMP_REG		0xe4
-#define	K8TEMP_REG_SELSENSOR	0x40
-#define	K8TEMP_REG_SELCORE	0x04
+#define	AMDTEMP_REG0F		0xe4
+#define	AMDTEMP_REG_SELSENSOR	0x40
+#define	AMDTEMP_REG_SELCORE	0x04
 
-#define K8TEMP_MINTEMP		49	/* -49 C is the mininum temperature */
+/*
+ * Register control (K10 & K11) family
+ */
+#define	AMDTEMP_REG		0xa4
 
-typedef enum {
-	SENSOR0_CORE0,
-	SENSOR0_CORE1,
-	SENSOR1_CORE0,
-	SENSOR1_CORE1,
-	CORE0,
-	CORE1
-} k8sensor_t;
+#define	TZ_ZEROC		2732
+
+					/* -49 C is the mininum temperature */
+#define	AMDTEMP_OFFSET0F	(TZ_ZEROC-490)
+#define	AMDTEMP_OFFSET		(TZ_ZEROC)
 
 /*
  * Device methods.
  */
-static void 	k8temp_identify(driver_t *driver, device_t parent);
-static int	k8temp_probe(device_t dev);
-static int	k8temp_attach(device_t dev);
-static void	k8temp_intrhook(void *arg);
-static int	k8temp_detach(device_t dev);
-static int 	k8temp_match(device_t dev);
-static int32_t	k8temp_gettemp(device_t dev, k8sensor_t sensor);
-static int	k8temp_sysctl(SYSCTL_HANDLER_ARGS);
+static void 	amdtemp_identify(driver_t *driver, device_t parent);
+static int	amdtemp_probe(device_t dev);
+static int	amdtemp_attach(device_t dev);
+static void	amdtemp_intrhook(void *arg);
+static int	amdtemp_detach(device_t dev);
+static int 	amdtemp_match(device_t dev);
+static int32_t	amdtemp_gettemp0f(device_t dev, amdsensor_t sensor);
+static int32_t	amdtemp_gettemp(device_t dev, amdsensor_t sensor);
+static int	amdtemp_sysctl(SYSCTL_HANDLER_ARGS);
 
-static device_method_t k8temp_methods[] = {
+static device_method_t amdtemp_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_identify,	k8temp_identify),
-	DEVMETHOD(device_probe,		k8temp_probe),
-	DEVMETHOD(device_attach,	k8temp_attach),
-	DEVMETHOD(device_detach,	k8temp_detach),
+	DEVMETHOD(device_identify,	amdtemp_identify),
+	DEVMETHOD(device_probe,		amdtemp_probe),
+	DEVMETHOD(device_attach,	amdtemp_attach),
+	DEVMETHOD(device_detach,	amdtemp_detach),
 
 	{0, 0}
 };
 
-static driver_t k8temp_driver = {
-	"k8temp",
-	k8temp_methods,
-	sizeof(struct k8temp_softc),
+static driver_t amdtemp_driver = {
+	"amdtemp",
+	amdtemp_methods,
+	sizeof(struct amdtemp_softc),
 };
 
-static devclass_t k8temp_devclass;
-DRIVER_MODULE(k8temp, hostb, k8temp_driver, k8temp_devclass, NULL, NULL);
+static devclass_t amdtemp_devclass;
+DRIVER_MODULE(amdtemp, hostb, amdtemp_driver, amdtemp_devclass, NULL, NULL);
 
 static int
-k8temp_match(device_t dev)
+amdtemp_match(device_t dev)
 {
 	int i;
 	uint16_t vendor, devid;
@@ -126,9 +142,9 @@ k8temp_match(device_t dev)
         vendor = pci_get_vendor(dev);
 	devid = pci_get_device(dev);
 
-	for (i = 0; k8temp_products[i].k8temp_vendorid != 0; i++) {
-		if (vendor == k8temp_products[i].k8temp_vendorid &&
-		    devid == k8temp_products[i].k8temp_deviceid)
+	for (i = 0; amdtemp_products[i].amdtemp_vendorid != 0; i++) {
+		if (vendor == amdtemp_products[i].amdtemp_vendorid &&
+		    devid == amdtemp_products[i].amdtemp_deviceid)
 			return (1);
 	}
 
@@ -136,28 +152,28 @@ k8temp_match(device_t dev)
 }
 
 static void
-k8temp_identify(driver_t *driver, device_t parent)
+amdtemp_identify(driver_t *driver, device_t parent)
 {
 	device_t child;
 
 	/* Make sure we're not being doubly invoked. */
-	if (device_find_child(parent, "k8temp", -1) != NULL)
+	if (device_find_child(parent, "amdtemp", -1) != NULL)
 		return;
 	
-	if (k8temp_match(parent)) {
-		child = device_add_child(parent, "k8temp", -1);
+	if (amdtemp_match(parent)) {
+		child = device_add_child(parent, "amdtemp", -1);
 		if (child == NULL)
-			device_printf(parent, "add k8temp child failed\n");
+			device_printf(parent, "add amdtemp child failed\n");
 	}
     
 }
 
 static int
-k8temp_probe(device_t dev)
+amdtemp_probe(device_t dev)
 {
 	uint32_t regs[4];
 	
-	if (resource_disabled("k8temp", 0))
+	if (resource_disabled("amdtemp", 0))
 		return (ENXIO);
 
 	do_cpuid(1, regs);
@@ -173,9 +189,9 @@ k8temp_probe(device_t dev)
 }
 
 static int
-k8temp_attach(device_t dev)
+amdtemp_attach(device_t dev)
 {
-	struct k8temp_softc *sc = device_get_softc(dev);
+	struct amdtemp_softc *sc = device_get_softc(dev);
 	struct sysctl_ctx_list *sysctlctx;
 	struct sysctl_oid *sysctlnode;
 
@@ -185,7 +201,7 @@ k8temp_attach(device_t dev)
 	 * needed because the cpu driver may be loaded late on boot, after
 	 * us.
 	 */
-	sc->sc_ich.ich_func = k8temp_intrhook;
+	sc->sc_ich.ich_func = amdtemp_intrhook;
 	sc->sc_ich.ich_arg = dev;
 	if (config_intrhook_establish(&sc->sc_ich) != 0) {
 		device_printf(dev, "config_intrhook_establish "
@@ -193,8 +209,15 @@ k8temp_attach(device_t dev)
 		return (ENXIO);
 	}
 	
+	if (pci_get_device(dev) == DEVICEID_AMD_MISC0F)
+		sc->sc_gettemp = amdtemp_gettemp0f;
+	else {
+		sc->sc_gettemp = amdtemp_gettemp;
+		return (0);
+	}
+
 	/*
-	 * dev.k8temp.N tree.
+	 * dev.amdtemp.N tree.
 	 */
 	sysctlctx = device_get_sysctl_ctx(dev);
 	sysctlnode = SYSCTL_ADD_NODE(sysctlctx,
@@ -204,13 +227,13 @@ k8temp_attach(device_t dev)
 	SYSCTL_ADD_PROC(sysctlctx,
 	    SYSCTL_CHILDREN(sysctlnode),
 	    OID_AUTO, "core0", CTLTYPE_INT | CTLFLAG_RD,
-	    dev, SENSOR0_CORE0, k8temp_sysctl, "I",
+	    dev, SENSOR0_CORE0, amdtemp_sysctl, "IK",
 	    "Sensor 0 / Core 0 temperature");
 	
 	SYSCTL_ADD_PROC(sysctlctx,
 	    SYSCTL_CHILDREN(sysctlnode),
 	    OID_AUTO, "core1", CTLTYPE_INT | CTLFLAG_RD,
-	    dev, SENSOR0_CORE1, k8temp_sysctl, "I",
+	    dev, SENSOR0_CORE1, amdtemp_sysctl, "IK",
 	    "Sensor 0 / Core 1 temperature");
 	
 	sysctlnode = SYSCTL_ADD_NODE(sysctlctx,
@@ -220,25 +243,25 @@ k8temp_attach(device_t dev)
 	SYSCTL_ADD_PROC(sysctlctx,
 	    SYSCTL_CHILDREN(sysctlnode),
 	    OID_AUTO, "core0", CTLTYPE_INT | CTLFLAG_RD,
-	    dev, SENSOR1_CORE0, k8temp_sysctl, "I",
+	    dev, SENSOR1_CORE0, amdtemp_sysctl, "IK",
 	    "Sensor 1 / Core 0 temperature");
 	
 	SYSCTL_ADD_PROC(sysctlctx,
 	    SYSCTL_CHILDREN(sysctlnode),
 	    OID_AUTO, "core1", CTLTYPE_INT | CTLFLAG_RD,
-	    dev, SENSOR1_CORE1, k8temp_sysctl, "I",
+	    dev, SENSOR1_CORE1, amdtemp_sysctl, "IK",
 	    "Sensor 1 / Core 1 temperature");
 
 	return (0);
 }
 
 void
-k8temp_intrhook(void *arg)
+amdtemp_intrhook(void *arg)
 {
 	int i;
 	device_t nexus, acpi, cpu;
 	device_t dev = (device_t) arg;
-	struct k8temp_softc *sc;
+	struct amdtemp_softc *sc;
 	struct sysctl_ctx_list *sysctlctx;
 
 	sc = device_get_softc(dev);
@@ -258,7 +281,7 @@ k8temp_intrhook(void *arg)
 			sc->sc_sysctl_cpu[i] = SYSCTL_ADD_PROC(sysctlctx,
 			    SYSCTL_CHILDREN(device_get_sysctl_tree(cpu)),
 			    OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD,
-			    dev, CORE0, k8temp_sysctl, "I",
+			    dev, CORE0, amdtemp_sysctl, "IK",
 			    "Max of sensor 0 / 1");
 		}
 	}
@@ -266,41 +289,42 @@ k8temp_intrhook(void *arg)
 }
 
 int
-k8temp_detach(device_t dev)
+amdtemp_detach(device_t dev)
 {
 	int i;
-	struct k8temp_softc *sc = device_get_softc(dev);
+	struct amdtemp_softc *sc = device_get_softc(dev);
 	
 	for (i = 0; i < 2; i++) {
 		if (sc->sc_sysctl_cpu[i])
 			sysctl_remove_oid(sc->sc_sysctl_cpu[i], 1, 0);
 	}
 
-	/* NewBus removes the dev.k8temp.N tree by itself. */
+	/* NewBus removes the dev.amdtemp.N tree by itself. */
 	
 	return (0);
 }
 
 static int
-k8temp_sysctl(SYSCTL_HANDLER_ARGS)
+amdtemp_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	device_t dev = (device_t) arg1;
+	struct amdtemp_softc *sc = device_get_softc(dev);
 	int error;
 	int32_t temp, auxtemp[2];
 
 	switch (arg2) {
 	case CORE0:
-		auxtemp[0] = k8temp_gettemp(dev, SENSOR0_CORE0);
-		auxtemp[1] = k8temp_gettemp(dev, SENSOR1_CORE0);
+		auxtemp[0] = sc->sc_gettemp(dev, SENSOR0_CORE0);
+		auxtemp[1] = sc->sc_gettemp(dev, SENSOR1_CORE0);
 		temp = imax(auxtemp[0], auxtemp[1]);
 		break;
 	case CORE1:
-		auxtemp[0] = k8temp_gettemp(dev, SENSOR0_CORE1);
-		auxtemp[1] = k8temp_gettemp(dev, SENSOR1_CORE1);
+		auxtemp[0] = sc->sc_gettemp(dev, SENSOR0_CORE1);
+		auxtemp[1] = sc->sc_gettemp(dev, SENSOR1_CORE1);
 		temp = imax(auxtemp[0], auxtemp[1]);
 		break;
 	default:
-		temp = k8temp_gettemp(dev, arg2);
+		temp = sc->sc_gettemp(dev, arg2);
 		break;
 	}
 	error = sysctl_handle_int(oidp, &temp, 0, req);
@@ -309,34 +333,45 @@ k8temp_sysctl(SYSCTL_HANDLER_ARGS)
 }
 
 static int32_t
-k8temp_gettemp(device_t dev, k8sensor_t sensor)
+amdtemp_gettemp0f(device_t dev, amdsensor_t sensor)
 {
 	uint8_t cfg;
 	uint32_t temp;
 	
-	cfg = pci_read_config(dev, K8TEMP_REG, 1);
+	cfg = pci_read_config(dev, AMDTEMP_REG0F, 1);
 	switch (sensor) {
 	case SENSOR0_CORE0:
-		cfg &= ~(K8TEMP_REG_SELSENSOR | K8TEMP_REG_SELCORE);
+		cfg &= ~(AMDTEMP_REG_SELSENSOR | AMDTEMP_REG_SELCORE);
 		break;
 	case SENSOR0_CORE1:
-		cfg &= ~K8TEMP_REG_SELSENSOR;
-		cfg |= K8TEMP_REG_SELCORE;
+		cfg &= ~AMDTEMP_REG_SELSENSOR;
+		cfg |= AMDTEMP_REG_SELCORE;
 		break;
 	case SENSOR1_CORE0:
-		cfg &= ~K8TEMP_REG_SELCORE;
-		cfg |= K8TEMP_REG_SELSENSOR;
+		cfg &= ~AMDTEMP_REG_SELCORE;
+		cfg |= AMDTEMP_REG_SELSENSOR;
 		break;
 	case SENSOR1_CORE1:
-		cfg |= (K8TEMP_REG_SELSENSOR | K8TEMP_REG_SELCORE);
+		cfg |= (AMDTEMP_REG_SELSENSOR | AMDTEMP_REG_SELCORE);
 		break;
 	default:
 		cfg = 0;
 		break;
 	}
-	pci_write_config(dev, K8TEMP_REG, cfg, 1);
-	temp = pci_read_config(dev, K8TEMP_REG, 4);
-	temp = ((temp >> 16) & 0xff) - K8TEMP_MINTEMP;
+	pci_write_config(dev, AMDTEMP_REG0F, cfg, 1);
+	temp = pci_read_config(dev, AMDTEMP_REG0F, 4);
+	temp = ((temp >> 16) & 0xff) * 10 + AMDTEMP_OFFSET0F;
 	
 	return (temp);
 }
+
+static int32_t
+amdtemp_gettemp(device_t dev, amdsensor_t sensor)
+{
+	uint32_t temp;
+
+	temp = pci_read_config(dev, AMDTEMP_REG, 4);
+	temp = ((temp >> 21) & 0x3ff) * 10 / 8 + AMDTEMP_OFFSET;
+
+	return (temp);
+}

Modified: stable/7/sys/modules/Makefile
==============================================================================
--- stable/7/sys/modules/Makefile	Thu May 21 17:01:38 2009	(r192547)
+++ stable/7/sys/modules/Makefile	Thu May 21 17:09:23 2009	(r192548)
@@ -17,6 +17,7 @@ SUBDIR=	${_3dfx} \
 	aic7xxx \
 	aio \
 	${_amd} \
+	${_amdtemp} \
 	ale \
 	amr \
 	${_an} \
@@ -143,7 +144,6 @@ SUBDIR=	${_3dfx} \
 	${_ixgb} \
 	jme \
 	joy \
-	${_k8temp} \
 	kbdmux \
 	krpc \
 	kue \
@@ -455,6 +455,7 @@ _zfs=		zfs
 _aac=		aac
 _acpi=		acpi
 _ahb=		ahb
+_amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _arl=		arl
 _asr=		asr
@@ -479,7 +480,7 @@ _ipw=		ipw
 _ipwfw=		ipwfw
 _iwi=		iwi
 _iwifw=		iwifw
-_ixgb=   	ixgb
+_ixgb=		ixgb
 _mly=		mly
 _nfe=		nfe
 _nve=		nve
@@ -508,6 +509,7 @@ _aac=		aac
 _acpi=		acpi
 _agp=		agp
 _an=		an
+_amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _cardbus=	cardbus
 _cbb=		cbb
@@ -544,7 +546,6 @@ _ips=		ips
 _ipw=		ipw
 _ipwfw=		ipwfw
 _ixgb=   	ixgb
-_k8temp=	k8temp
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux
From rpaulo at FreeBSD.org  Thu May 21 17:12:14 2009
From: rpaulo at FreeBSD.org (Rui Paulo)
Date: Thu May 21 17:12:25 2009
Subject: svn commit: r192549 - stable/7
Message-ID: <200905211712.n4LHCDE6073125@svn.freebsd.org>

Author: rpaulo
Date: Thu May 21 17:12:13 2009
New Revision: 192549
URL: http://svn.freebsd.org/changeset/base/192549

Log:
  Mention k8temp -> amdtemp rename.

Modified:
  stable/7/UPDATING

Modified: stable/7/UPDATING
==============================================================================
--- stable/7/UPDATING	Thu May 21 17:09:23 2009	(r192548)
+++ stable/7/UPDATING	Thu May 21 17:12:13 2009	(r192549)
@@ -8,6 +8,10 @@ Items affecting the ports and packages s
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
+20090521:
+	The k8temp(4) driver has been renamed to amdtemp(4) since               
+	support for K10 and K11 CPU families was added.
+
 20090520:
 	Update ZFS to version 13. ZFS users will need to re-build
 	kernel and world. Existing pools will continue to work
From delphij at delphij.net  Thu May 21 18:24:17 2009
From: delphij at delphij.net (Xin LI)
Date: Thu May 21 18:24:34 2009
Subject: svn commit: r192068 - in stable/7: etc etc/mtree etc/rc.d
 gnu/usr.bin/man gnu/usr.bin/man/man
In-Reply-To: <86y6sq1g5j.fsf@ds4.des.no>
References: <200905140135.n4E1ZhQG072751@svn.freebsd.org>
	<86y6sq1g5j.fsf@ds4.des.no>
Message-ID: <4A159BF0.8010001@delphij.net>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dag-Erling Sm?rgrav wrote:
> Dag-Erling Smorgrav  writes:
>> Log:
>>   MFC r183696, r183698: enable UTF-8 for man pages.
> 
> If you use a UTF-8 locale and dashes in man pages (e.g. in command-line
> options) look weird after this commit, merge r192561 from head into your
> tree.  I will MFC it in a week or so.

Oh I was wondering this long ago but did not went into depth about it,
thanks for fixing it!

Cheers,
- --
Xin LI 	http://www.delphij.net/
FreeBSD - The Power to Serve!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (FreeBSD)

iEYEARECAAYFAkoVm/AACgkQi+vbBBjt66CyWQCdFclhzDfRGIV2PCUFYSMSahv2
D4UAn1LIF80gOeDjo+AOO6gfJxvRjxrc
=+OC0
-----END PGP SIGNATURE-----
From des at des.no  Thu May 21 18:32:44 2009
From: des at des.no (=?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?=)
Date: Thu May 21 18:32:57 2009
Subject: svn commit: r192068 - in stable/7: etc etc/mtree etc/rc.d
	gnu/usr.bin/man gnu/usr.bin/man/man
In-Reply-To: <200905140135.n4E1ZhQG072751@svn.freebsd.org> (Dag-Erling
	Smorgrav's message of "Thu, 14 May 2009 01:35:43 +0000 (UTC)")
References: <200905140135.n4E1ZhQG072751@svn.freebsd.org>
Message-ID: <86y6sq1g5j.fsf@ds4.des.no>

Dag-Erling Smorgrav  writes:
> Log:
>   MFC r183696, r183698: enable UTF-8 for man pages.

If you use a UTF-8 locale and dashes in man pages (e.g. in command-line
options) look weird after this commit, merge r192561 from head into your
tree.  I will MFC it in a week or so.

DES
-- 
Dag-Erling Sm?rgrav - des@des.no
From antoine at FreeBSD.org  Fri May 22 16:11:01 2009
From: antoine at FreeBSD.org (Antoine Brodin)
Date: Fri May 22 16:11:19 2009
Subject: svn commit: r192587 - in stable/7: share/man/man4 sys sys/conf
	sys/contrib/pf sys/dev/ath/ath_hal sys/dev/cxgb
Message-ID: <200905221611.n4MGB0oI011620@svn.freebsd.org>

Author: antoine
Date: Fri May 22 16:11:00 2009
New Revision: 192587
URL: http://svn.freebsd.org/changeset/base/192587

Log:
  MFC r191318 to stable/7:
    vlan(4) no longer depends on miibus(4).
  
    Reviewed by:	jhb@
    MFC after:	1 month

Modified:
  stable/7/share/man/man4/   (props changed)
  stable/7/share/man/man4/igb.4   (props changed)
  stable/7/share/man/man4/vlan.4
  stable/7/sys/   (props changed)
  stable/7/sys/conf/NOTES
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/share/man/man4/vlan.4
==============================================================================
--- stable/7/share/man/man4/vlan.4	Fri May 22 15:56:43 2009	(r192586)
+++ stable/7/share/man/man4/vlan.4	Fri May 22 16:11:00 2009	(r192587)
@@ -36,7 +36,6 @@ To compile this driver into the kernel,
 place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
-.Cd "device miibus"
 .Cd "device vlan"
 .Ed
 .Pp
@@ -193,18 +192,7 @@ The MTU setting on
 .Nm
 can be corrected manually if used in conjunction with such a parent interface.
 .Sh SEE ALSO
-.Xr kqueue 2 ,
-.Xr miibus 4 ,
 .Xr ifconfig 8 ,
 .Xr sysctl 8
 .Sh BUGS
 No 802.1Q features except VLAN tagging are implemented.
-.Pp
-.Dv EVFILT_NETDEV
-events on a
-.Nm
-interface will be sent through
-.Xr kqueue 2
-only if the parent interface uses
-.Xr miibus 4
-for link state notification.

Modified: stable/7/sys/conf/NOTES
==============================================================================
--- stable/7/sys/conf/NOTES	Fri May 22 15:56:43 2009	(r192586)
+++ stable/7/sys/conf/NOTES	Fri May 22 16:11:00 2009	(r192587)
@@ -710,7 +710,7 @@ device		mn	# Munich32x/Falc54 Nx64kbit/s
 #  Ethernets; it is MANDATORY when an Ethernet device driver is
 #  configured or token-ring is enabled.
 #  The `vlan' device implements the VLAN tagging of Ethernet frames
-#  according to IEEE 802.1Q.  It requires `device miibus'.
+#  according to IEEE 802.1Q.
 #  The `wlan' device provides generic code to support 802.11
 #  drivers, including host AP mode; it is MANDATORY for the wi,
 #  ath, and awi drivers and will eventually be required by all 802.11 drivers.
From kmacy at FreeBSD.org  Fri May 22 17:54:03 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Fri May 22 17:54:20 2009
Subject: svn commit: r192590 - stable/7/sys/sys
Message-ID: <200905221754.n4MHs3cr014003@svn.freebsd.org>

Author: kmacy
Date: Fri May 22 17:54:02 2009
New Revision: 192590
URL: http://svn.freebsd.org/changeset/base/192590

Log:
  some ports erroneously use the existence of AT_FDCWD to check for
  the availability of the *at system calls so s/AT_FDCWD/AT_FDCWD_notyet/g
  
  Reported by: Dimitry Andric

Modified:
  stable/7/sys/sys/fcntl.h
  stable/7/sys/sys/namei.h

Modified: stable/7/sys/sys/fcntl.h
==============================================================================
--- stable/7/sys/sys/fcntl.h	Fri May 22 16:46:01 2009	(r192589)
+++ stable/7/sys/sys/fcntl.h	Fri May 22 17:54:02 2009	(r192590)
@@ -110,7 +110,7 @@ typedef	__pid_t		pid_t;
  * to determine the target of relative file paths in the openat() and
  * similar syscalls.
  */
-#define	AT_FDCWD		-100
+#define	AT_FDCWD_notyet		-100
 
 /* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */
 #define	O_NOCTTY	0x8000		/* don't assign controlling terminal */

Modified: stable/7/sys/sys/namei.h
==============================================================================
--- stable/7/sys/sys/namei.h	Fri May 22 16:46:01 2009	(r192589)
+++ stable/7/sys/sys/namei.h	Fri May 22 17:54:02 2009	(r192590)
@@ -154,11 +154,11 @@ struct nameidata {
  * Initialization of a nameidata structure.
  */
 #define	NDINIT(ndp, op, flags, segflg, namep, td)			\
-	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, NULL, td)
+	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD_notyet, NULL, td)
 #define	NDINIT_AT(ndp, op, flags, segflg, namep, dirfd, td)		\
 	NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, NULL, td)
 #define	NDINIT_ATVP(ndp, op, flags, segflg, namep, vp, td)		\
-	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, vp, td)
+	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD_notyet, vp, td)
 
 static __inline void
 NDINIT_ALL(struct nameidata *ndp,
From jhb at freebsd.org  Fri May 22 19:13:02 2009
From: jhb at freebsd.org (John Baldwin)
Date: Fri May 22 19:13:20 2009
Subject: svn commit: r192590 - stable/7/sys/sys
In-Reply-To: <200905221754.n4MHs3cr014003@svn.freebsd.org>
References: <200905221754.n4MHs3cr014003@svn.freebsd.org>
Message-ID: <200905221507.39476.jhb@freebsd.org>

On Friday 22 May 2009 1:54:03 pm Kip Macy wrote:
> Author: kmacy
> Date: Fri May 22 17:54:02 2009
> New Revision: 192590
> URL: http://svn.freebsd.org/changeset/base/192590
> 
> Log:
>   some ports erroneously use the existence of AT_FDCWD to check for
>   the availability of the *at system calls so s/AT_FDCWD/AT_FDCWD_notyet/g
>   
>   Reported by: Dimitry Andric

I wonder if it wouldn't be appropriate to just remove the dirfd bits entirely 
from 7.x for now.  I.e. remove NDINIT_AT(), AT_FDCWD_notyet, the 'dirfd' 
member from the structure, the 'dirfd' parameter from NDINIT_ALL(), etc.  ZFS 
only really needed NDINIT_ATVP(), yes?

> Modified:
>   stable/7/sys/sys/fcntl.h
>   stable/7/sys/sys/namei.h
> 
> Modified: stable/7/sys/sys/fcntl.h
> 
==============================================================================
> --- stable/7/sys/sys/fcntl.h	Fri May 22 16:46:01 2009	(r192589)
> +++ stable/7/sys/sys/fcntl.h	Fri May 22 17:54:02 2009	(r192590)
> @@ -110,7 +110,7 @@ typedef	__pid_t		pid_t;
>   * to determine the target of relative file paths in the openat() and
>   * similar syscalls.
>   */
> -#define	AT_FDCWD		-100
> +#define	AT_FDCWD_notyet		-100
>  
>  /* Defined by POSIX 1003.1; BSD default, but must be distinct from 
O_RDONLY. */
>  #define	O_NOCTTY	0x8000		/* don't assign controlling terminal */
> 
> Modified: stable/7/sys/sys/namei.h
> 
==============================================================================
> --- stable/7/sys/sys/namei.h	Fri May 22 16:46:01 2009	(r192589)
> +++ stable/7/sys/sys/namei.h	Fri May 22 17:54:02 2009	(r192590)
> @@ -154,11 +154,11 @@ struct nameidata {
>   * Initialization of a nameidata structure.
>   */
>  #define	NDINIT(ndp, op, flags, segflg, namep, td)			\
> -	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, NULL, td)
> +	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD_notyet, NULL, td)
>  #define	NDINIT_AT(ndp, op, flags, segflg, namep, dirfd, td)		\
>  	NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, NULL, td)
>  #define	NDINIT_ATVP(ndp, op, flags, segflg, namep, vp, td)		\
> -	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, vp, td)
> +	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD_notyet, vp, td)
>  
>  static __inline void
>  NDINIT_ALL(struct nameidata *ndp,
> 



-- 
John Baldwin
From dimitry at andric.com  Fri May 22 20:08:35 2009
From: dimitry at andric.com (Dimitry Andric)
Date: Fri May 22 20:08:41 2009
Subject: svn commit: r192590 - stable/7/sys/sys
In-Reply-To: <200905221507.39476.jhb@freebsd.org>
References: <200905221754.n4MHs3cr014003@svn.freebsd.org>
	<200905221507.39476.jhb@freebsd.org>
Message-ID: <4A17063F.60303@andric.com>

On 2009-05-22 21:07, John Baldwin wrote:
>> Log:
>>   some ports erroneously use the existence of AT_FDCWD to check for
>>   the availability of the *at system calls so s/AT_FDCWD/AT_FDCWD_notyet/g
>>   
>>   Reported by: Dimitry Andric
> 
> I wonder if it wouldn't be appropriate to just remove the dirfd bits entirely 
> from 7.x for now.  I.e. remove NDINIT_AT(), AT_FDCWD_notyet, the 'dirfd' 
> member from the structure, the 'dirfd' parameter from NDINIT_ALL(), etc.  ZFS 
> only really needed NDINIT_ATVP(), yes?

Are there any plans to MFC the *at() calls?  (I'd guess not, since it
looks like they change the ABI...)  
From jhb at freebsd.org  Fri May 22 20:21:23 2009
From: jhb at freebsd.org (John Baldwin)
Date: Fri May 22 20:21:35 2009
Subject: svn commit: r192590 - stable/7/sys/sys
In-Reply-To: <4A17063F.60303@andric.com>
References: <200905221754.n4MHs3cr014003@svn.freebsd.org>
	<200905221507.39476.jhb@freebsd.org> <4A17063F.60303@andric.com>
Message-ID: <200905221621.15507.jhb@freebsd.org>

On Friday 22 May 2009 4:08:31 pm Dimitry Andric wrote:
> On 2009-05-22 21:07, John Baldwin wrote:
> >> Log:
> >>   some ports erroneously use the existence of AT_FDCWD to check for
> >>   the availability of the *at system calls so s/AT_FDCWD/AT_FDCWD_notyet/g
> >>   
> >>   Reported by: Dimitry Andric
> > 
> > I wonder if it wouldn't be appropriate to just remove the dirfd bits entirely 
> > from 7.x for now.  I.e. remove NDINIT_AT(), AT_FDCWD_notyet, the 'dirfd' 
> > member from the structure, the 'dirfd' parameter from NDINIT_ALL(), etc.  ZFS 
> > only really needed NDINIT_ATVP(), yes?
> 
> Are there any plans to MFC the *at() calls?  (I'd guess not, since it
> looks like they change the ABI...) 

I don't think there are due to the ABI change, and if they were ever MFC'd,
the NDINIT, etc. bits could be restored as part of that merge.

-- 
John Baldwin
From kostikbel at gmail.com  Fri May 22 20:33:55 2009
From: kostikbel at gmail.com (Kostik Belousov)
Date: Fri May 22 20:34:08 2009
Subject: svn commit: r192590 - stable/7/sys/sys
In-Reply-To: <200905221621.15507.jhb@freebsd.org>
References: <200905221754.n4MHs3cr014003@svn.freebsd.org>
	<200905221507.39476.jhb@freebsd.org> <4A17063F.60303@andric.com>
	<200905221621.15507.jhb@freebsd.org>
Message-ID: <20090522203347.GE1927@deviant.kiev.zoral.com.ua>

On Fri, May 22, 2009 at 04:21:14PM -0400, John Baldwin wrote:
> On Friday 22 May 2009 4:08:31 pm Dimitry Andric wrote:
> > On 2009-05-22 21:07, John Baldwin wrote:
> > >> Log:
> > >>   some ports erroneously use the existence of AT_FDCWD to check for
> > >>   the availability of the *at system calls so s/AT_FDCWD/AT_FDCWD_notyet/g
> > >>   
> > >>   Reported by: Dimitry Andric
> > > 
> > > I wonder if it wouldn't be appropriate to just remove the dirfd bits entirely 
> > > from 7.x for now.  I.e. remove NDINIT_AT(), AT_FDCWD_notyet, the 'dirfd' 
> > > member from the structure, the 'dirfd' parameter from NDINIT_ALL(), etc.  ZFS 
> > > only really needed NDINIT_ATVP(), yes?
> > 
> > Are there any plans to MFC the *at() calls?  (I'd guess not, since it
> > looks like they change the ABI...) 
> 
> I don't think there are due to the ABI change, and if they were ever MFC'd,
> the NDINIT, etc. bits could be restored as part of that merge.
No, the MFC is posponed not due to KBI change. As I said, I already have
a permission from re@ to change nameidata.

Robert (Cc:ed) hold the MFC because the new fd argument of the at syscalls
is not audited.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-stable-7/attachments/20090522/f153b00d/attachment.pgp
From cperciva at FreeBSD.org  Fri May 22 21:26:35 2009
From: cperciva at FreeBSD.org (Colin Percival)
Date: Fri May 22 21:26:42 2009
Subject: svn commit: r192602 - stable/7/usr.sbin/sysinstall
Message-ID: <200905222126.n4MLQZNG019314@svn.freebsd.org>

Author: cperciva
Date: Fri May 22 21:26:34 2009
New Revision: 192602
URL: http://svn.freebsd.org/changeset/base/192602

Log:
  MFC r192130:
    Allow a comma-separated list of network interfaces to be specified via the
    netDev option in install.cfg.

Modified:
  stable/7/usr.sbin/sysinstall/   (props changed)
  stable/7/usr.sbin/sysinstall/tcpip.c

Modified: stable/7/usr.sbin/sysinstall/tcpip.c
==============================================================================
--- stable/7/usr.sbin/sysinstall/tcpip.c	Fri May 22 20:55:29 2009	(r192601)
+++ stable/7/usr.sbin/sysinstall/tcpip.c	Fri May 22 21:26:34 2009	(r192602)
@@ -651,11 +651,26 @@ tcpDeviceSelect(void)
 {
     DMenu *menu;
     Device **devs, *rval;
+    char *dev, *network_dev;
     int cnt;
 
+    rval = NULL;
+
+    if (variable_get(VAR_NONINTERACTIVE) && variable_get(VAR_NETWORK_DEVICE)) {
+	network_dev = variable_get(VAR_NETWORK_DEVICE);
+
+	while ((dev = strsep(&network_dev, ",")) != NULL) {
+	    devs = deviceFind(dev, DEVICE_TYPE_NETWORK);
+	    cnt = deviceCount(devs);
+	    if (cnt) {
+		if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
+		    return(devs[0]);
+	    }
+	}
+    }
+
     devs = deviceFind(variable_get(VAR_NETWORK_DEVICE), DEVICE_TYPE_NETWORK);
     cnt = deviceCount(devs);
-    rval = NULL;
 
     if (!cnt) {
 	msgConfirm("No network devices available!");
@@ -669,14 +684,6 @@ tcpDeviceSelect(void)
 	if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
 	    rval = devs[0];
     }
-    else if (variable_get(VAR_NONINTERACTIVE) && variable_get(VAR_NETWORK_DEVICE)) {
-	devs = deviceFind(variable_get(VAR_NETWORK_DEVICE), DEVICE_TYPE_NETWORK);
-	cnt = deviceCount(devs);
-	if (cnt) {
-	    if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
-		rval = devs[0];
-	}
-    }
     else {
 	int status;
 
From des at FreeBSD.org  Fri May 22 22:57:07 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Fri May 22 22:57:18 2009
Subject: svn commit: r192611 - in stable/7: contrib/csup sys/contrib/rdma
	sys/contrib/rdma/krping
Message-ID: <200905222257.n4MMv5uB021535@svn.freebsd.org>

Author: des
Date: Fri May 22 22:57:05 2009
New Revision: 192611
URL: http://svn.freebsd.org/changeset/base/192611

Log:
  Expand $FreeBSD$

Modified:
  stable/7/contrib/csup/rcstokenizer.l   (props changed)
  stable/7/sys/contrib/rdma/core_priv.h   (props changed)
  stable/7/sys/contrib/rdma/ib_addr.h   (props changed)
  stable/7/sys/contrib/rdma/ib_cache.h   (props changed)
  stable/7/sys/contrib/rdma/ib_cm.h   (props changed)
  stable/7/sys/contrib/rdma/ib_fmr_pool.h   (props changed)
  stable/7/sys/contrib/rdma/ib_mad.h   (props changed)
  stable/7/sys/contrib/rdma/ib_marshall.h   (props changed)
  stable/7/sys/contrib/rdma/ib_pack.h   (props changed)
  stable/7/sys/contrib/rdma/ib_sa.h   (props changed)
  stable/7/sys/contrib/rdma/ib_smi.h   (props changed)
  stable/7/sys/contrib/rdma/ib_umem.h   (props changed)
  stable/7/sys/contrib/rdma/ib_user_cm.h   (props changed)
  stable/7/sys/contrib/rdma/ib_user_mad.h   (props changed)
  stable/7/sys/contrib/rdma/ib_user_sa.h   (props changed)
  stable/7/sys/contrib/rdma/ib_user_verbs.h   (props changed)
  stable/7/sys/contrib/rdma/ib_verbs.h   (props changed)
  stable/7/sys/contrib/rdma/iw_cm.h   (props changed)
  stable/7/sys/contrib/rdma/krping/getopt.c   (props changed)
  stable/7/sys/contrib/rdma/krping/getopt.h   (props changed)
  stable/7/sys/contrib/rdma/krping/krping.c   (props changed)
  stable/7/sys/contrib/rdma/krping/krping.h   (props changed)
  stable/7/sys/contrib/rdma/krping/krping_dev.c   (props changed)
  stable/7/sys/contrib/rdma/rdma_addr.c   (props changed)
  stable/7/sys/contrib/rdma/rdma_cache.c   (props changed)
  stable/7/sys/contrib/rdma/rdma_cm.h   (props changed)
  stable/7/sys/contrib/rdma/rdma_cm_ib.h   (props changed)
  stable/7/sys/contrib/rdma/rdma_cma.c   (props changed)
  stable/7/sys/contrib/rdma/rdma_device.c   (props changed)
  stable/7/sys/contrib/rdma/rdma_iwcm.c   (props changed)
  stable/7/sys/contrib/rdma/rdma_user_cm.h   (props changed)
  stable/7/sys/contrib/rdma/rdma_verbs.c   (props changed)
  stable/7/sys/contrib/rdma/types.h   (props changed)
From des at FreeBSD.org  Fri May 22 23:29:06 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Fri May 22 23:29:18 2009
Subject: svn commit: r192614 - in stable/7/sys/cddl/contrib/opensolaris:
	common/atomic/ia64 uts/common/sys
Message-ID: <200905222329.n4MNT5A4022359@svn.freebsd.org>

Author: des
Date: Fri May 22 23:29:05 2009
New Revision: 192614
URL: http://svn.freebsd.org/changeset/base/192614

Log:
  Expand $FreeBSD$

Modified:
  stable/7/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h   (props changed)
From brueffer at FreeBSD.org  Sat May 23 10:35:28 2009
From: brueffer at FreeBSD.org (Christian Brueffer)
Date: Sat May 23 10:35:35 2009
Subject: svn commit: r192632 - in stable/7/lib/libc: . posix1e string
Message-ID: <200905231035.n4NAZRfr053371@svn.freebsd.org>

Author: brueffer
Date: Sat May 23 10:35:27 2009
New Revision: 192632
URL: http://svn.freebsd.org/changeset/base/192632

Log:
  MFC: r192410
  
  Since audit(4) isn't based on posix1e, remove the commented out audit.h header,
  xref libbsm(3).

Modified:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/posix1e/posix1e.3
  stable/7/lib/libc/string/ffsll.c   (props changed)
  stable/7/lib/libc/string/flsll.c   (props changed)

Modified: stable/7/lib/libc/posix1e/posix1e.3
==============================================================================
--- stable/7/lib/libc/posix1e/posix1e.3	Sat May 23 09:24:07 2009	(r192631)
+++ stable/7/lib/libc/posix1e/posix1e.3	Sat May 23 10:35:27 2009	(r192632)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 17, 2000
+.Dd May 20, 2009
 .Dt POSIX1E 3
 .Os
 .Sh NAME
@@ -36,7 +36,6 @@
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/acl.h
-.\" .In sys/audit.h
 .\" .In sys/capability.h
 .In sys/mac.h
 .Sh DESCRIPTION
@@ -104,6 +103,7 @@ structure.
 .Sh SEE ALSO
 .Xr extattr 2 ,
 .Xr acl 3 ,
+.Xr libbsm 3 ,
 .Xr mac 3 ,
 .Xr acl 9 ,
 .Xr extattr 9 ,
From antoine at FreeBSD.org  Sat May 23 17:17:55 2009
From: antoine at FreeBSD.org (Antoine Brodin)
Date: Sat May 23 17:18:02 2009
Subject: svn commit: r192654 - in stable/7/sys: . amd64/conf boot/forth
	contrib/pf dev/ath/ath_hal dev/cxgb
Message-ID: <200905231717.n4NHHtpd061903@svn.freebsd.org>

Author: antoine
Date: Sat May 23 17:17:54 2009
New Revision: 192654
URL: http://svn.freebsd.org/changeset/base/192654

Log:
  MFC r189872 to stable/7:
    Chase the k8temp->amdtemp rename in NOTES and loader.conf.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/conf/NOTES
  stable/7/sys/boot/forth/loader.conf
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/amd64/conf/NOTES
==============================================================================
--- stable/7/sys/amd64/conf/NOTES	Sat May 23 17:13:35 2009	(r192653)
+++ stable/7/sys/amd64/conf/NOTES	Sat May 23 17:17:54 2009	(r192654)
@@ -456,10 +456,10 @@ device		ichwd
 # Temperature sensors:
 #
 # coretemp: on-die sensor on Intel Core and newer CPUs
-# k8temp: on-die sensor on AMD K8 CPUs
+# amdtemp: on-die sensor on AMD K8/K10/K11 CPUs
 #
 device		coretemp
-device		k8temp
+device		amdtemp
 
 #---------------------------------------------------------------------------
 # ISDN4BSD

Modified: stable/7/sys/boot/forth/loader.conf
==============================================================================
--- stable/7/sys/boot/forth/loader.conf	Sat May 23 17:13:35 2009	(r192653)
+++ stable/7/sys/boot/forth/loader.conf	Sat May 23 17:17:54 2009	(r192654)
@@ -388,7 +388,7 @@ accf_http_load="NO"		# Wait for full HTT
 random_load="NO"		# Random device
 speaker_load="NO"		# AT speaker module
 coretemp_load="NO"		# Intel Core CPU temperature monitor
-k8temp_load="NO"		# AMD K8 temperature monitor
+amdtemp_load="NO"		# AMD K8/K10/K11 temperature monitor
 
 ##############################################################
 ###  ACPI settings  ##########################################
From kmacy at FreeBSD.org  Sat May 23 19:54:22 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Sat May 23 19:54:30 2009
Subject: svn commit: r192665 - in stable/7/sys/boot: . common i386
	i386/libi386 i386/loader i386/zfsboot zfs
Message-ID: <200905231954.n4NJsIKj066434@svn.freebsd.org>

Author: kmacy
Date: Sat May 23 19:54:18 2009
New Revision: 192665
URL: http://svn.freebsd.org/changeset/base/192665

Log:
  Import ZFS loader support missed in the initial MFC
  set LOADER_ZFS_SUPPORT=Y in make.conf to enable

Added:
  stable/7/sys/boot/i386/zfsboot/Makefile   (contents, props changed)
  stable/7/sys/boot/i386/zfsboot/zfsldr.S   (contents, props changed)
  stable/7/sys/boot/zfs/Makefile   (contents, props changed)
  stable/7/sys/boot/zfs/zfs.c   (contents, props changed)
Modified:
  stable/7/sys/boot/Makefile
  stable/7/sys/boot/common/bootstrap.h
  stable/7/sys/boot/i386/Makefile
  stable/7/sys/boot/i386/libi386/bootinfo32.c
  stable/7/sys/boot/i386/libi386/devicename.c
  stable/7/sys/boot/i386/loader/Makefile
  stable/7/sys/boot/i386/loader/conf.c
  stable/7/sys/boot/i386/loader/main.c

Modified: stable/7/sys/boot/Makefile
==============================================================================
--- stable/7/sys/boot/Makefile	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/Makefile	Sat May 23 19:54:18 2009	(r192665)
@@ -17,6 +17,10 @@ SUBDIR+=		efi
 SUBDIR+=		ofw
 .endif
 
+.if defined(LOADER_ZFS_SUPPORT)
+SUBDIR+=		zfs
+.endif
+
 # Pick the machine-dependent subdir based on the target architecture.
 SUBDIR+=		${MACHINE:S/amd64/i386/:S/sun4v/sparc64/}
 

Modified: stable/7/sys/boot/common/bootstrap.h
==============================================================================
--- stable/7/sys/boot/common/bootstrap.h	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/common/bootstrap.h	Sat May 23 19:54:18 2009	(r192665)
@@ -43,6 +43,7 @@ struct devdesc 
 #define DEVT_DISK	1
 #define DEVT_NET	2
 #define	DEVT_CD		3
+#define DEVT_ZFS	4
     int			d_unit;
 };
 

Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/i386/Makefile	Sat May 23 19:54:18 2009	(r192665)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
-		libi386 libfirewire loader
+SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
+		kgzldr libi386 libfirewire loader
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr

Modified: stable/7/sys/boot/i386/libi386/bootinfo32.c
==============================================================================
--- stable/7/sys/boot/i386/libi386/bootinfo32.c	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/i386/libi386/bootinfo32.c	Sat May 23 19:54:18 2009	(r192665)
@@ -183,6 +183,7 @@ bi_load32(char *args, int *howtop, int *
 	break;
 
     case DEVT_NET:
+    case DEVT_ZFS:
 	    break;
 	    
     default:

Modified: stable/7/sys/boot/i386/libi386/devicename.c
==============================================================================
--- stable/7/sys/boot/i386/libi386/devicename.c	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/i386/libi386/devicename.c	Sat May 23 19:54:18 2009	(r192665)
@@ -171,6 +171,7 @@ i386_parsedev(struct i386_devdesc **dev,
 
     case DEVT_CD:
     case DEVT_NET:
+    case DEVT_ZFS:
 	unit = 0;
 
 	if (*np && (*np != ':')) {
@@ -246,6 +247,7 @@ i386_fmtdev(void *vdev)
 	break;
 
     case DEVT_NET:
+    case DEVT_ZFS:
 	sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);
 	break;
     }

Modified: stable/7/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/7/sys/boot/i386/loader/Makefile	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/i386/loader/Makefile	Sat May 23 19:54:18 2009	(r192665)
@@ -15,6 +15,12 @@ CFLAGS+=	-DLOADER_FIREWIRE_SUPPORT
 LIBFIREWIRE=	${.OBJDIR}/../libfirewire/libfirewire.a
 .endif
 
+# Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support
+.if defined(LOADER_ZFS_SUPPORT)
+CFLAGS+=	-DLOADER_ZFS_SUPPORT
+LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
+.endif
+
 # Enable PXE TFTP or NFS support, not both.
 .if defined(LOADER_TFTP_SUPPORT)
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
@@ -99,8 +105,8 @@ FILES+=	loader.rc
 # XXX crt0.o needs to be first for pxeboot(8) to work
 OBJS=	${BTXCRT} 
 
-DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBI386} ${LIBSTAND}
-LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBI386} -lstand
+DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
+LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} -lstand
 
 .include 
 

Modified: stable/7/sys/boot/i386/loader/conf.c
==============================================================================
--- stable/7/sys/boot/i386/loader/conf.c	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/i386/loader/conf.c	Sat May 23 19:54:18 2009	(r192665)
@@ -50,6 +50,10 @@ __FBSDID("$FreeBSD$");
 extern struct devsw fwohci;
 #endif
 
+#if defined(LOADER_ZFS_SUPPORT)
+extern struct devsw zfs_dev;
+#endif
+
 /* Exported for libstand */
 struct devsw *devsw[] = {
     &bioscd,
@@ -60,15 +64,25 @@ struct devsw *devsw[] = {
 #if defined(LOADER_FIREWIRE_SUPPORT)
     &fwohci,
 #endif
+#if defined(LOADER_ZFS_SUPPORT)
+    &zfs_dev,
+#endif
     NULL
 };
 
+#if defined(LOADER_ZFS_SUPPORT)
+extern struct fs_ops zfs_fsops;
+#endif
+
 struct fs_ops *file_system[] = {
     &ufs_fsops,
     &ext2fs_fsops,
     &dosfs_fsops,
     &cd9660_fsops,
     &splitfs_fsops,
+#if defined(LOADER_ZFS_SUPPORT)
+    &zfs_fsops,
+#endif
 #ifdef LOADER_GZIP_SUPPORT
     &gzipfs_fsops,
 #endif

Modified: stable/7/sys/boot/i386/loader/main.c
==============================================================================
--- stable/7/sys/boot/i386/loader/main.c	Sat May 23 19:42:23 2009	(r192664)
+++ stable/7/sys/boot/i386/loader/main.c	Sat May 23 19:54:18 2009	(r192665)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #define	KARGS_FLAGS_CD		0x1
 #define	KARGS_FLAGS_PXE		0x2
+#define	KARGS_FLAGS_ZFS		0x4
 
 /* Arguments passed in from the boot1/boot2 loader */
 static struct 
@@ -51,8 +52,13 @@ static struct 
     u_int32_t	howto;
     u_int32_t	bootdev;
     u_int32_t	bootflags;
-    u_int32_t	pxeinfo;
-    u_int32_t	res2;
+    union {
+	struct {
+	    u_int32_t	pxeinfo;
+	    u_int32_t	res2;
+	};
+	uint64_t	zfspool;
+    };
     u_int32_t	bootinfo;
 } *kargs;
 
@@ -96,7 +102,7 @@ main(void)
      */
     bios_getmem();
 
-#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) || defined(LOADER_GPT_SUPPORT)
+#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) || defined(LOADER_GPT_SUPPORT) || defined(LOADER_ZFS_SUPPORT)
     heap_top = PTOV(memtop_copyin);
     memtop_copyin -= 0x300000;
     heap_bottom = PTOV(memtop_copyin);
@@ -145,6 +151,14 @@ main(void)
 	    bc_add(initial_bootdev);
     }
 
+    archsw.arch_autoload = i386_autoload;
+    archsw.arch_getdev = i386_getdev;
+    archsw.arch_copyin = i386_copyin;
+    archsw.arch_copyout = i386_copyout;
+    archsw.arch_readin = i386_readin;
+    archsw.arch_isainb = isa_inb;
+    archsw.arch_isaoutb = isa_outb;
+
     /*
      * March through the device switch probing for things.
      */
@@ -172,14 +186,6 @@ main(void)
     
     bios_getsmap();
 
-    archsw.arch_autoload = i386_autoload;
-    archsw.arch_getdev = i386_getdev;
-    archsw.arch_copyin = i386_copyin;
-    archsw.arch_copyout = i386_copyout;
-    archsw.arch_readin = i386_readin;
-    archsw.arch_isainb = isa_inb;
-    archsw.arch_isaoutb = isa_outb;
-
     interact();			/* doesn't return */
 
     /* if we ever get here, it is an error */
@@ -252,6 +258,29 @@ extract_currdev(void)
 	       i386_setcurrdev, env_nounset);
     env_setenv("loaddev", EV_VOLATILE, i386_fmtdev(&new_currdev), env_noset,
 	       env_nounset);
+
+#ifdef LOADER_ZFS_SUPPORT
+    /*
+     * If we were started from a ZFS-aware boot2, we can work out
+     * which ZFS pool we are booting from.
+     */
+    if (kargs->bootflags & KARGS_FLAGS_ZFS) {
+	/*
+	 * Dig out the pool guid and convert it to a 'unit number'
+	 */
+	uint64_t guid;
+	int unit;
+	char devname[32];
+	extern int zfs_guid_to_unit(uint64_t);
+
+	guid = kargs->zfspool;
+	unit = zfs_guid_to_unit(guid);
+	if (unit >= 0) {
+	    sprintf(devname, "zfs%d", unit);
+	    setenv("currdev", devname, 1);
+	}
+    }
+#endif
 }
 
 COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot);

Added: stable/7/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/boot/i386/zfsboot/Makefile	Sat May 23 19:54:18 2009	(r192665)
@@ -0,0 +1,108 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../boot2
+
+FILES=		zfsboot
+
+NM?=		nm
+
+# A value of 0x80 enables LBA support.
+BOOT_BOOT1_FLAGS?=	0x80
+
+BOOT_COMCONSOLE_PORT?= 0x3f8
+BOOT_COMCONSOLE_SPEED?= 9600
+B2SIOFMT?=	0x3
+
+REL1=	0x700
+ORG1=	0x7c00
+ORG2=	0x2000
+
+CFLAGS=	-Os -g \
+	-fno-guess-branch-probability \
+	-fomit-frame-pointer \
+	-fno-unit-at-a-time \
+	-mno-align-long-strings \
+	-mrtd \
+	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
+	-DBOOT2 \
+	-DFLAGS=${BOOT_BOOT1_FLAGS} \
+	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
+	-DSIOFMT=${B2SIOFMT} \
+	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
+	-I${.CURDIR}/../../zfs \
+	-I${.CURDIR}/../../../cddl/boot/zfs \
+	-I${.CURDIR}/../btx/lib -I. \
+	-I${.CURDIR}/../boot2 \
+	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
+	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
+	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+	-Winline --param max-inline-insns-single=100
+
+LDFLAGS=-static -N --gc-sections
+
+# Pick up ../Makefile.inc early.
+.include 
+
+CLEANFILES=	zfsboot
+
+zfsboot: zfsboot1 zfsboot2
+	cat zfsboot1 zfsboot2 > zfsboot
+
+CLEANFILES+=	zfsboot1 zfsldr.out zfsldr.o
+
+zfsboot1: zfsldr.out
+	objcopy -S -O binary zfsldr.out ${.TARGET}
+
+zfsldr.out: zfsldr.o
+	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o
+
+CLEANFILES+=	zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \
+		zfsboot.o zfsboot.s zfsboot.s.tmp zfsboot.h sio.o
+
+# We currently allow 32768 bytes for zfsboot - in practice it could be
+# any size up to 3.5Mb but keeping it fixed size simplifies zfsldr.
+# 
+BOOT2SIZE=	32768
+
+zfsboot2: zfsboot.ld
+	@set -- `ls -l zfsboot.ld`; x=$$((${BOOT2SIZE}-$$5)); \
+	    echo "$$x bytes available"; test $$x -ge 0
+	dd if=zfsboot.ld of=${.TARGET} obs=${BOOT2SIZE} conv=osync
+
+zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
+	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \
+	    -o ${.TARGET} -P 1 zfsboot.bin
+
+zfsboot.ldr:
+	cp /dev/null ${.TARGET}
+
+zfsboot.bin: zfsboot.out
+	objcopy -S -O binary zfsboot.out ${.TARGET}
+
+zfsboot.out: ${BTXCRT} zfsboot.o sio.o
+	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
+
+zfsboot.o: zfsboot.s
+
+SRCS=	zfsboot.c zfsboot.h
+
+zfsboot.s: zfsboot.c zfsboot.h ${.CURDIR}/../../zfs/zfsimpl.c
+	${CC} ${CFLAGS} -S -o zfsboot.s.tmp ${.CURDIR}/zfsboot.c
+	sed -e '/align/d' -e '/nop/d' < zfsboot.s.tmp > zfsboot.s
+	rm -f zfsboot.s.tmp
+
+zfsboot.h: zfsldr.out
+	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
+	    { x = $$1 - ORG1; \
+	    printf("#define XREADORG %#x\n", REL1 + x) }' \
+	    ORG1=`printf "%d" ${ORG1}` \
+	    REL1=`printf "%d" ${REL1}` > ${.TARGET}
+
+.if ${MACHINE_ARCH} == "amd64"
+beforedepend zfsboot.s: machine
+CLEANFILES+=	machine
+machine:
+	ln -sf ${.CURDIR}/../../../i386/include machine
+.endif
+
+.include 

Added: stable/7/sys/boot/i386/zfsboot/zfsldr.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/boot/i386/zfsboot/zfsldr.S	Sat May 23 19:54:18 2009	(r192665)
@@ -0,0 +1,402 @@
+/*
+ * Copyright (c) 1998 Robert Nordier
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ *
+ * $FreeBSD$
+ */
+
+/* Memory Locations */
+		.set MEM_REL,0x700		# Relocation address
+		.set MEM_ARG,0x900		# Arguments
+		.set MEM_ORG,0x7c00		# Origin
+		.set MEM_BUF,0x8000		# Load area
+		.set MEM_BTX,0x9000		# BTX start
+		.set MEM_JMP,0x9010		# BTX entry point
+		.set MEM_USR,0xa000		# Client start
+		.set BDA_BOOT,0x472		# Boot howto flag
+	
+/* Partition Constants */
+		.set PRT_OFF,0x1be		# Partition offset
+		.set PRT_NUM,0x4		# Partitions
+		.set PRT_BSD,0xa5		# Partition type
+
+/* Flag Bits */
+		.set FL_PACKET,0x80		# Packet mode
+
+/* Misc. Constants */
+		.set SIZ_PAG,0x1000		# Page size
+		.set SIZ_SEC,0x200		# Sector size
+
+		.set NSECT,0x40
+		.globl start
+		.globl xread
+		.code16
+
+start:		jmp main			# Start recognizably
+
+/*
+ * This is the start of a standard BIOS Parameter Block (BPB). Most bootable
+ * FAT disks have this at the start of their MBR. While normal BIOS's will
+ * work fine without this section, IBM's El Torito emulation "fixes" up the
+ * BPB by writing into the memory copy of the MBR. Rather than have data
+ * written into our xread routine, we'll define a BPB to work around it.
+ * The data marked with (T) indicates a field required for a ThinkPad to
+ * recognize the disk and (W) indicates fields written from IBM BIOS code.
+ * The use of the BPB is based on what OpenBSD and NetBSD implemented in
+ * their boot code but the required fields were determined by trial and error.
+ *
+ * Note: If additional space is needed in boot1, one solution would be to
+ * move the "prompt" message data (below) to replace the OEM ID.
+ */
+		.org 0x03, 0x00
+oemid:		.space 0x08, 0x00	# OEM ID
+
+		.org 0x0b, 0x00
+bpb:		.word   512		# sector size (T)
+		.byte	0		# sectors/clustor
+		.word	0		# reserved sectors
+		.byte	0		# number of FATs
+		.word	0		# root entries
+		.word	0		# small sectors
+		.byte	0		# media type (W)
+		.word	0		# sectors/fat
+		.word	18		# sectors per track (T)
+		.word	2		# number of heads (T)
+		.long	0		# hidden sectors (W)
+		.long	0		# large sectors
+
+		.org 0x24, 0x00
+ebpb:		.byte	0		# BIOS physical drive number (W)
+
+		.org 0x25,0x90
+/*
+ * Trampoline used by boot2 to call read to read data from the disk via
+ * the BIOS.  Call with:
+ *
+ * %cx:%ax	- long    - LBA to read in
+ * %es:(%bx)	- caddr_t - buffer to read data into
+ * %dl		- byte    - drive to read from
+ * %dh		- byte    - num sectors to read
+ */
+
+xread:		push %ss			# Address
+		pop %ds				#  data
+/*
+ * Setup an EDD disk packet and pass it to read
+ */
+xread.1:					# Starting
+		pushl $0x0			#  absolute
+		push %cx			#  block
+		push %ax			#  number
+		push %es			# Address of
+		push %bx			#  transfer buffer
+		xor %ax,%ax			# Number of
+		movb %dh,%al			#  blocks to
+		push %ax			#  transfer
+		push $0x10			# Size of packet
+		mov %sp,%bp			# Packet pointer
+		callw read			# Read from disk
+		lea 0x10(%bp),%sp		# Clear stack
+		lret				# To far caller
+/*
+ * Load the rest of boot2 and BTX up, copy the parts to the right locations,
+ * and start it all up.
+ */
+
+/*
+ * Setup the segment registers to flat addressing (segment 0) and setup the
+ * stack to end just below the start of our code.
+ */
+main:		cld				# String ops inc
+		xor %cx,%cx			# Zero
+		mov %cx,%es			# Address
+		mov %cx,%ds			#  data
+		mov %cx,%ss			# Set up
+		mov $start,%sp			#  stack
+/*
+ * Relocate ourself to MEM_REL.  Since %cx == 0, the inc %ch sets
+ * %cx == 0x100.
+ */
+		mov %sp,%si			# Source
+		mov $MEM_REL,%di		# Destination
+		incb %ch			# Word count
+		rep				# Copy
+		movsw				#  code
+/*
+ * If we are on a hard drive, then load the MBR and look for the first
+ * FreeBSD slice.  We use the fake partition entry below that points to
+ * the MBR when we call nread.  The first pass looks for the first active
+ * FreeBSD slice.  The second pass looks for the first non-active FreeBSD
+ * slice if the first one fails.
+ */
+		mov $part4,%si			# Partition
+		cmpb $0x80,%dl			# Hard drive?
+		jb main.4			# No
+		movb $0x1,%dh			# Block count
+		callw nread			# Read MBR
+		mov $0x1,%cx	 		# Two passes
+main.1: 	mov $MEM_BUF+PRT_OFF,%si	# Partition table
+		movb $0x1,%dh			# Partition
+main.2: 	cmpb $PRT_BSD,0x4(%si)		# Our partition type?
+		jne main.3			# No
+		jcxz main.5			# If second pass
+		testb $0x80,(%si)		# Active?
+		jnz main.5			# Yes
+main.3: 	add $0x10,%si	 		# Next entry
+		incb %dh			# Partition
+		cmpb $0x1+PRT_NUM,%dh		# In table?
+		jb main.2			# Yes
+		dec %cx				# Do two
+		jcxz main.1			#  passes
+/*
+ * If we get here, we didn't find any FreeBSD slices at all, so print an
+ * error message and die.
+ */
+		mov $msg_part,%si		# Message
+		jmp error			# Error
+/*
+ * Floppies use partition 0 of drive 0.
+ */
+main.4: 	xor %dx,%dx			# Partition:drive
+
+/*
+ * Ok, we have a slice and drive in %dx now, so use that to locate and
+ * load boot2.  %si references the start of the slice we are looking
+ * for, so go ahead and load up the 64 sectors starting at sector 1024
+ * (i.e. after the two vdev labels).  We don't have do anything fancy
+ * here to allow for an extra copy of boot1 and a partition table
+ * (compare to this section of the UFS bootstrap) so we just load it
+ * all at 0x8000. The first part of boot2 is BTX, which wants to run
+ * at 0x9000. The boot2.bin binary starts right after the end of BTX,
+ * so we have to figure out where the start of it is and then move the
+ * binary to 0xc000. After we have moved the client, we relocate BTX
+ * itself to 0x9000 - doing it in this order means that none of the
+ * memcpy regions overlap which would corrupt the copy.  Normally, BTX
+ * clients start at MEM_USR, or 0xa000, but when we use btxld to
+ * create boot2, we use an entry point of 0x2000.  That entry point is
+ * relative to MEM_USR; thus boot2.bin starts at 0xc000.
+ *
+ * The load area and the target area for the client overlap so we have
+ * to use a decrementing string move. We also play segment register
+ * games with the destination address for the move so that the client
+ * can be larger than 16k (which would overflow the zero segment since
+ * the client starts at 0xc000). Relocating BTX is easy since the load
+ * area and target area do not overlap.
+ */
+main.5: 	mov %dx,MEM_ARG			# Save args
+		movb $NSECT,%dh			# Sector count
+		movw $1024,%ax			# Offset to boot2
+		callw nread.1			# Read disk
+main.6:		mov $MEM_BUF,%si		# BTX (before reloc)
+		mov 0xa(%si),%bx		# Get BTX length and set
+		mov $NSECT*SIZ_SEC-1,%di	# Size of load area (less one)
+		mov %di,%si			# End of load
+		add $MEM_BUF,%si		#  area
+		sub %bx,%di			# End of client, 0xc000 rel
+		mov %di,%cx			# Size of
+		inc %cx				#  client
+		mov $(MEM_USR+2*SIZ_PAG)>>4,%dx	# Segment
+		mov %dx,%es			#   addressing 0xc000
+		std				# Move with decrement
+		rep				# Relocate
+		movsb				#  client
+		mov %ds,%dx			# Back to
+		mov %dx,%es			#  zero segment
+		mov $MEM_BUF,%si		# BTX (before reloc)
+		mov $MEM_BTX,%di		# BTX
+		mov %bx,%cx			# Get BTX length
+		cld				# Increment this time
+		rep				# Relocate
+		movsb				#  BTX
+
+/*
+ * Enable A20 so we can access memory above 1 meg.
+ * Use the zero-valued %cx as a timeout for embedded hardware which do not
+ * have a keyboard controller.
+ */
+seta20: 	cli				# Disable interrupts
+seta20.1:	dec %cx				# Timeout?
+		jz seta20.3			# Yes
+		inb $0x64,%al			# Get status
+		testb $0x2,%al			# Busy?
+		jnz seta20.1			# Yes
+		movb $0xd1,%al			# Command: Write
+		outb %al,$0x64			#  output port
+seta20.2:	inb $0x64,%al			# Get status
+		testb $0x2,%al			# Busy?
+		jnz seta20.2			# Yes
+		movb $0xdf,%al			# Enable
+		outb %al,$0x60			#  A20
+seta20.3:	sti				# Enable interrupts
+
+		jmp start+MEM_JMP-MEM_ORG	# Start BTX
+
+
+/*
+ * Trampoline used to call read from within boot1.
+ */
+nread:		xor %ax,%ax			# Sector offset in partition
+nread.1:	mov $MEM_BUF,%bx		# Transfer buffer
+		add 0x8(%si),%ax		# Get
+		mov 0xa(%si),%cx		#  LBA
+		push %cs			# Read from
+		callw xread.1	 		#  disk
+		jnc return			# If success, return
+		mov $msg_read,%si		# Otherwise, set the error
+						#  message and fall through to
+						#  the error routine
+/*
+ * Print out the error message pointed to by %ds:(%si) followed
+ * by a prompt, wait for a keypress, and then reboot the machine.
+ */
+error:		callw putstr			# Display message
+		mov $prompt,%si			# Display
+		callw putstr			#  prompt
+		xorb %ah,%ah			# BIOS: Get
+		int $0x16			#  keypress
+		movw $0x1234, BDA_BOOT		# Do a warm boot
+		ljmp $0xffff,$0x0		# reboot the machine
+/*
+ * Display a null-terminated string using the BIOS output.
+ */
+putstr.0:	mov $0x7,%bx	 		# Page:attribute
+		movb $0xe,%ah			# BIOS: Display
+		int $0x10			#  character
+putstr: 	lodsb				# Get char
+		testb %al,%al			# End of string?
+		jne putstr.0			# No
+
+/*
+ * Overused return code.  ereturn is used to return an error from the
+ * read function.  Since we assume putstr succeeds, we (ab)use the
+ * same code when we return from putstr.
+ */
+ereturn:	movb $0x1,%ah			# Invalid
+		stc				#  argument
+return: 	retw				# To caller
+/*
+ * Reads sectors from the disk.  If EDD is enabled, then check if it is
+ * installed and use it if it is.  If it is not installed or not enabled, then
+ * fall back to using CHS.  Since we use a LBA, if we are using CHS, we have to
+ * fetch the drive parameters from the BIOS and divide it out ourselves.
+ * Call with:
+ *
+ * %dl	- byte     - drive number
+ * stack - 10 bytes - EDD Packet
+ */
+read:		testb $FL_PACKET,%cs:MEM_REL+flags-start # LBA support enabled?
+		jz read.1			# No, use CHS
+		cmpb $0x80,%dl			# Hard drive?
+		jb read.1			# No, use CHS
+		mov $0x55aa,%bx			# Magic
+		push %dx			# Save
+		movb $0x41,%ah			# BIOS: Check
+		int $0x13			#  extensions present
+		pop %dx				# Restore
+		jc read.1			# If error, use CHS
+		cmp $0xaa55,%bx			# Magic?
+		jne read.1			# No, so use CHS
+		testb $0x1,%cl			# Packet interface?
+		jz read.1			# No, so use CHS
+		mov %bp,%si			# Disk packet
+		movb $0x42,%ah			# BIOS: Extended
+		int $0x13			#  read
+		retw				# To caller
+#if 0	
+read.1:	 	push %dx			# Save
+		movb $0x8,%ah			# BIOS: Get drive
+		int $0x13			#  parameters
+		movb %dh,%ch			# Max head number
+		pop %dx				# Restore
+		jc return			# If error
+		andb $0x3f,%cl			# Sectors per track
+		jz ereturn			# If zero
+		cli				# Disable interrupts
+		mov 0x8(%bp),%eax		# Get LBA
+		push %dx			# Save
+		movzbl %cl,%ebx			# Divide by
+		xor %edx,%edx			#  sectors
+		div %ebx			#  per track
+		movb %ch,%bl			# Max head number
+		movb %dl,%ch			# Sector number
+		inc %bx				# Divide by
+		xorb %dl,%dl			#  number
+		div %ebx			#  of heads
+		movb %dl,%bh			# Head number
+		pop %dx				# Restore
+		cmpl $0x3ff,%eax		# Cylinder number supportable?
+		sti				# Enable interrupts
+		ja ereturn			# No, return an error
+		xchgb %al,%ah			# Set up cylinder
+		rorb $0x2,%al			#  number
+		orb %ch,%al			# Merge
+		inc %ax				#  sector
+		xchg %ax,%cx	 		#  number
+		movb %bh,%dh			# Head number
+		subb %ah,%al			# Sectors this track
+		mov 0x2(%bp),%ah		# Blocks to read
+		cmpb %ah,%al			# To read
+		jb read.2			#  this
+#ifdef	TRACK_AT_A_TIME
+		movb %ah,%al			#  track
+#else
+		movb $1,%al			#  one sector
+#endif
+read.2: 	mov $0x5,%di	 		# Try count
+read.3: 	les 0x4(%bp),%bx		# Transfer buffer
+		push %ax			# Save
+		movb $0x2,%ah			# BIOS: Read
+		int $0x13			#  from disk
+		pop %bx				# Restore
+		jnc read.4			# If success
+		dec %di				# Retry?
+		jz read.6			# No
+		xorb %ah,%ah			# BIOS: Reset
+		int $0x13			#  disk system
+		xchg %bx,%ax	 		# Block count
+		jmp read.3			# Continue
+read.4: 	movzbw %bl,%ax	 		# Sectors read
+		add %ax,0x8(%bp)		# Adjust
+		jnc read.5			#  LBA,
+		incw 0xa(%bp)	 		#  transfer
+read.5: 	shlb %bl			#  buffer
+		add %bl,0x5(%bp)		#  pointer,
+		sub %al,0x2(%bp)		#  block count
+		ja read.1			# If not done
+read.6: 	retw				# To caller
+#else
+read.1:		mov $msg_chs,%si
+		jmp error
+msg_chs:	.asciz "CHS not supported"
+#endif
+
+/* Messages */
+
+msg_read:	.asciz "Read"
+msg_part:	.asciz "Boot"
+
+prompt: 	.asciz " error\r\n"
+
+flags:		.byte FLAGS			# Flags
+
+		.org PRT_OFF,0x90
+
+/* Partition table */
+
+		.fill 0x30,0x1,0x0
+part4:		.byte 0x80, 0x00, 0x01, 0x00
+		.byte 0xa5, 0xfe, 0xff, 0xff
+		.byte 0x00, 0x00, 0x00, 0x00
+		.byte 0x50, 0xc3, 0x00, 0x00	# 50000 sectors long, bleh
+
+		.word 0xaa55			# Magic number

Added: stable/7/sys/boot/zfs/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/boot/zfs/Makefile	Sat May 23 19:54:18 2009	(r192665)
@@ -0,0 +1,39 @@
+# $FreeBSD$
+
+LIB=		zfsboot
+INTERNALLIB=
+
+SRCS+=		zfs.c
+
+CFLAGS+=	-I${.CURDIR}/../common -I${.CURDIR}/../.. -I.
+CFLAGS+=	-I${.CURDIR}/../../../lib/libstand
+CFLAGS+=	-I${.CURDIR}/../../cddl/boot/zfs
+
+CFLAGS+=	-ffreestanding
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+CFLAGS+=	-mpreferred-stack-boundary=2
+CFLAGS+=	-mno-mmx -mno-3dnow -mno-sse -mno-sse2
+.endif
+.if ${MACHINE_ARCH} == "i386"
+CFLAGS+=	-mno-sse3
+.endif
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm"
+CFLAGS+=	-msoft-float
+.endif
+.if ${MACHINE_ARCH} == "amd64"
+CFLAGS+=	-m32 -march=i386
+.endif
+
+CFLAGS+=	-Wformat -Wall
+
+.if ${MACHINE_ARCH} == "amd64"
+CLEANFILES+=    machine
+machine:
+	ln -sf ${.CURDIR}/../../i386/include machine
+.endif
+
+.include 
+
+.if ${MACHINE_ARCH} == "amd64"
+beforedepend ${OBJS}: machine
+.endif

Added: stable/7/sys/boot/zfs/zfs.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/boot/zfs/zfs.c	Sat May 23 19:54:18 2009	(r192665)
@@ -0,0 +1,518 @@
+/*-
+ * Copyright (c) 2007 Doug Rabson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (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$
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+/*
+ *	Stand-alone file reading package.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "zfsimpl.c"
+
+static int	zfs_open(const char *path, struct open_file *f);
+static int	zfs_write(struct open_file *f, void *buf, size_t size, size_t *resid);
+static int	zfs_close(struct open_file *f);
+static int	zfs_read(struct open_file *f, void *buf, size_t size, size_t *resid);
+static off_t	zfs_seek(struct open_file *f, off_t offset, int where);
+static int	zfs_stat(struct open_file *f, struct stat *sb);
+static int	zfs_readdir(struct open_file *f, struct dirent *d);
+
+struct devsw zfs_dev;
+
+struct fs_ops zfs_fsops = {
+	"zfs",
+	zfs_open,
+	zfs_close,
+	zfs_read,
+	zfs_write,
+	zfs_seek,
+	zfs_stat,
+	zfs_readdir
+};
+
+/*
+ * In-core open file.
+ */
+struct file {
+	off_t		f_seekp;	/* seek pointer */
+	dnode_phys_t	f_dnode;
+	uint64_t	f_zap_type;	/* zap type for readdir */
+	uint64_t	f_num_leafs;	/* number of fzap leaf blocks */
+	zap_leaf_phys_t	*f_zap_leaf;	/* zap leaf buffer */
+};
+
+/*
+ * Open a file.
+ */
+static int
+zfs_open(const char *upath, struct open_file *f)
+{
+	spa_t *spa = (spa_t *) f->f_devdata;
+	struct file *fp;
+	int rc;
+
+	if (f->f_dev != &zfs_dev)
+		return (EINVAL);
+
+	rc = zfs_mount_pool(spa);
+	if (rc)
+		return (rc);
+
+	/* allocate file system specific data structure */
+	fp = malloc(sizeof(struct file));
+	bzero(fp, sizeof(struct file));
+	f->f_fsdata = (void *)fp;
+
+	if (spa->spa_root_objset.os_type != DMU_OST_ZFS) {
+		printf("Unexpected object set type %lld\n",
+		    spa->spa_root_objset.os_type);
+		rc = EIO;
+		goto out;
+	}
+
+	rc = zfs_lookup(spa, upath, &fp->f_dnode);
+	if (rc)
+		goto out;
+
+	fp->f_seekp = 0;
+out:
+	if (rc) {
+		f->f_fsdata = NULL;
+		free(fp);
+	}
+	return (rc);
+}
+
+static int
+zfs_close(struct open_file *f)
+{
+	struct file *fp = (struct file *)f->f_fsdata;
+
+	dnode_cache_obj = 0;
+	f->f_fsdata = (void *)0;
+	if (fp == (struct file *)0)
+		return (0);
+
+	free(fp);
+	return (0);
+}
+
+/*
+ * Copy a portion of a file into kernel memory.
+ * Cross block boundaries when necessary.
+ */
+static int
+zfs_read(struct open_file *f, void *start, size_t size, size_t *resid	/* out */)
+{
+	spa_t *spa = (spa_t *) f->f_devdata;
+	struct file *fp = (struct file *)f->f_fsdata;
+	const znode_phys_t *zp = (const znode_phys_t *) fp->f_dnode.dn_bonus;
+	size_t n;
+	int rc;
+
+	n = size;
+	if (fp->f_seekp + n > zp->zp_size)
+		n = zp->zp_size - fp->f_seekp;
+	
+	rc = dnode_read(spa, &fp->f_dnode, fp->f_seekp, start, n);
+	if (rc)
+		return (rc);
+
+	if (0) {
+	    int i;
+	    for (i = 0; i < n; i++)
+		putchar(((char*) start)[i]);
+	}
+	fp->f_seekp += n;
+	if (resid)
+		*resid = size - n;
+
+	return (0);
+}
+
+/*
+ * Don't be silly - the bootstrap has no business writing anything.
+ */
+static int
+zfs_write(struct open_file *f, void *start, size_t size, size_t *resid	/* out */)
+{
+
+	return (EROFS);
+}
+
+static off_t
+zfs_seek(struct open_file *f, off_t offset, int where)
+{
+	struct file *fp = (struct file *)f->f_fsdata;
+	znode_phys_t *zp = (znode_phys_t *) fp->f_dnode.dn_bonus;
+
+	switch (where) {
+	case SEEK_SET:
+		fp->f_seekp = offset;
+		break;
+	case SEEK_CUR:
+		fp->f_seekp += offset;
+		break;
+	case SEEK_END:
+		fp->f_seekp = zp->zp_size - offset;
+		break;
+	default:
+		errno = EINVAL;
+		return (-1);
+	}
+	return (fp->f_seekp);
+}
+
+static int
+zfs_stat(struct open_file *f, struct stat *sb)
+{
+	struct file *fp = (struct file *)f->f_fsdata;
+	znode_phys_t *zp = (znode_phys_t *) fp->f_dnode.dn_bonus;
+
+	/* only important stuff */
+	sb->st_mode = zp->zp_mode;
+	sb->st_uid = zp->zp_uid;
+	sb->st_gid = zp->zp_gid;
+	sb->st_size = zp->zp_size;
+
+	return (0);
+}
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From kmacy at FreeBSD.org  Sun May 24 20:49:24 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Sun May 24 20:49:39 2009
Subject: svn commit: r192697 - stable/7/usr.sbin/btxld
Message-ID: <200905242049.n4OKnMlg000827@svn.freebsd.org>

Author: kmacy
Date: Sun May 24 20:49:22 2009
New Revision: 192697
URL: http://svn.freebsd.org/changeset/base/192697

Log:
  merge 177933
  
  Allow for a zero length 'loader'.

Modified:
  stable/7/usr.sbin/btxld/btxld.c

Modified: stable/7/usr.sbin/btxld/btxld.c
==============================================================================
--- stable/7/usr.sbin/btxld/btxld.c	Sun May 24 20:34:29 2009	(r192696)
+++ stable/7/usr.sbin/btxld/btxld.c	Sun May 24 20:49:22 2009	(r192697)
@@ -336,6 +336,8 @@ gethdr(int fd, struct hdr *hdr)
     if (sb.st_size > MAXU32)
 	errx(1, "%s: Too big", fname);
     hdr->size = sb.st_size;
+    if (!hdr->size)
+	return;
     if ((p = mmap(NULL, hdr->size, PROT_READ, MAP_SHARED, fd,
 		  0)) == MAP_FAILED)
 	err(2, "%s", fname);
From kmacy at FreeBSD.org  Mon May 25 02:59:56 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Mon May 25 03:00:07 2009
Subject: svn commit: r192714 - in stable/7/sys/boot/i386: . gptzfsboot
Message-ID: <200905250259.n4P2xtY4008509@svn.freebsd.org>

Author: kmacy
Date: Mon May 25 02:59:54 2009
New Revision: 192714
URL: http://svn.freebsd.org/changeset/base/192714

Log:
  import gptzfsboot

Added:
  stable/7/sys/boot/i386/gptzfsboot/
  stable/7/sys/boot/i386/gptzfsboot/Makefile   (contents, props changed)
Modified:
  stable/7/sys/boot/i386/Makefile

Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile	Mon May 25 02:36:29 2009	(r192713)
+++ stable/7/sys/boot/i386/Makefile	Mon May 25 02:59:54 2009	(r192714)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
-		kgzldr libi386 libfirewire loader
+		gptzfsboot kgzldr libi386 libfirewire loader
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr

Added: stable/7/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/sys/boot/i386/gptzfsboot/Makefile	Mon May 25 02:59:54 2009	(r192714)
@@ -0,0 +1,74 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../boot2 ${.CURDIR}/../gptboot ${.CURDIR}/../zfsboot
+
+FILES=		gptzfsboot
+
+NM?=		nm
+
+BOOT_COMCONSOLE_PORT?= 0x3f8
+BOOT_COMCONSOLE_SPEED?= 9600
+B2SIOFMT?=	0x3
+
+REL1=	0x700
+ORG1=	0x7c00
+ORG2=	0x0
+
+CFLAGS=	-Os \
+	-fno-guess-branch-probability \
+	-fomit-frame-pointer \
+	-fno-unit-at-a-time \
+	-mno-align-long-strings \
+	-mrtd \
+	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
+	-DGPT -DBOOT2 \
+	-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
+	-DSIOFMT=${B2SIOFMT} \
+	-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
+	-I${.CURDIR}/../../common \
+	-I${.CURDIR}/../../zfs \
+	-I${.CURDIR}/../../../cddl/boot/zfs \
+	-I${.CURDIR}/../btx/lib -I. \
+	-I${.CURDIR}/../boot2 \
+	-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
+	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
+	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+	-Winline --param max-inline-insns-single=100
+
+LDFLAGS=-static -N --gc-sections
+
+# Pick up ../Makefile.inc early.
+.include 
+
+CLEANFILES=	gptzfsboot
+
+gptzfsboot: gptldr.bin gptzfsboot.bin ${BTXKERN}
+	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l gptldr.bin \
+	    -o ${.TARGET} gptzfsboot.bin
+
+CLEANFILES+=	gptldr.bin gptldr.out gptldr.o
+
+gptldr.bin: gptldr.out
+	objcopy -S -O binary gptldr.out ${.TARGET}
+
+gptldr.out: gptldr.o
+	${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
+
+CLEANFILES+=	gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o
+
+gptzfsboot.bin: gptzfsboot.out
+	objcopy -S -O binary gptzfsboot.out ${.TARGET}
+
+gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o
+	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
+
+zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
+
+.if ${MACHINE_ARCH} == "amd64"
+beforedepend zfsboot.o: machine
+CLEANFILES+=	machine
+machine:
+	ln -sf ${.CURDIR}/../../../i386/include machine
+.endif
+
+.include 
From kmacy at FreeBSD.org  Mon May 25 03:06:28 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Mon May 25 03:06:44 2009
Subject: svn commit: r192715 - stable/7/sys/boot/i386
Message-ID: <200905250306.n4P36RxQ008815@svn.freebsd.org>

Author: kmacy
Date: Mon May 25 03:06:26 2009
New Revision: 192715
URL: http://svn.freebsd.org/changeset/base/192715

Log:
  don't try building zfsboot and gptzfsboot if zfs loader is not enabled

Modified:
  stable/7/sys/boot/i386/Makefile

Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile	Mon May 25 02:59:54 2009	(r192714)
+++ stable/7/sys/boot/i386/Makefile	Mon May 25 03:06:26 2009	(r192715)
@@ -1,7 +1,11 @@
 # $FreeBSD$
 
-SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
-		gptzfsboot kgzldr libi386 libfirewire loader
+SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
+		kgzldr libi386 libfirewire loader
+
+.if defined(LOADER_ZFS_SUPPORT)
+SUBDIR+=		zfsboot gptzfsboot
+.endif
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr
From dougb at FreeBSD.org  Mon May 25 04:11:32 2009
From: dougb at FreeBSD.org (Doug Barton)
Date: Mon May 25 04:11:49 2009
Subject: svn commit: r192721 - stable/7/usr.sbin/mergemaster
Message-ID: <200905250411.n4P4BU23010409@svn.freebsd.org>

Author: dougb
Date: Mon May 25 04:11:30 2009
New Revision: 192721
URL: http://svn.freebsd.org/changeset/base/192721

Log:
  MFC 192219:
  Add -L to the mtree invocation to chase symbolic links that are present
  in "Service jails."
  
  MFC 192230:
  Enhance the safety and efficiency of the -U option,
  fix indentation on one line.

Modified:
  stable/7/usr.sbin/mergemaster/mergemaster.sh

Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/7/usr.sbin/mergemaster/mergemaster.sh	Mon May 25 03:53:12 2009	(r192720)
+++ stable/7/usr.sbin/mergemaster/mergemaster.sh	Mon May 25 04:11:30 2009	(r192721)
@@ -115,8 +115,10 @@ diff_loop () {
   while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \
     "${HANDLE_COMPFILE}" = "NOT V" ]; do
     if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then
-      if [ -n "${AUTO_UPGRADE}" ]; then
-        if echo "${CHANGED}" | grep -qsv ${DESTDIR}${COMPFILE#.}; then
+      if [ -n "${AUTO_UPGRADE}" -a -n "${CHANGED}" ]; then
+        case "${CHANGED}" in
+        *:${DESTDIR}${COMPFILE#.}:*) ;;		# File has been modified
+        *)
           echo ''
           echo "  *** ${COMPFILE} has not been user modified."
           echo ''
@@ -128,10 +130,11 @@ diff_loop () {
             AUTO_UPGRADED_FILES="${AUTO_UPGRADED_FILES}      ${DESTDIR}${COMPFILE#.}
 "
           else
-          echo "   *** Problem upgrading ${COMPFILE}, it will remain to merge by hand"
+            echo "   *** Problem upgrading ${COMPFILE}, it will remain to merge by hand"
           fi
           return
-        fi
+          ;;
+        esac
       fi
       if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then
 	echo ''
@@ -348,7 +351,7 @@ fi
 case "${AUTO_UPGRADE}" in
 '') ;;	# If the option is not set no need to run the test or warn the user
 *)
-  if [ ! -f "${DESTDIR}${MTREEFILE}" ]; then
+  if [ ! -s "${DESTDIR}${MTREEFILE}" ]; then
     echo ''
     echo "*** Unable to find mtree database. Skipping auto-upgrade."
     echo ''
@@ -459,14 +462,15 @@ MM_MAKE="make ${ARCHSTRING} -m ${SOURCED
 # Check DESTDIR against the mergemaster mtree database to see what
 # files the user changed from the reference files.
 #
-CHANGED=
-if [ -n "${AUTO_UPGRADE}" -a -f "${DESTDIR}${MTREEFILE}" ]; then
-	for file in `mtree -eq -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
+if [ -n "${AUTO_UPGRADE}" -a -s "${DESTDIR}${MTREEFILE}" ]; then
+	CHANGED=:
+	for file in `mtree -eqL -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
 		2>/dev/null | awk '($2 == "changed") {print $1}'`; do
 		if [ -f "${DESTDIR}/$file" ]; then
-			CHANGED="${CHANGED} ${DESTDIR}/$file"
+			CHANGED="${CHANGED}${DESTDIR}/${file}:"
 		fi
 	done
+	[ "$CHANGED" = ':' ] && unset CHANGED
 fi
 
 # Check the width of the user's terminal
@@ -1055,7 +1059,7 @@ done # This is for the for way up there 
 echo ''
 echo "*** Comparison complete"
 
-if [ -f "${MTREENEW}" ]; then
+if [ -s "${MTREENEW}" ]; then
   echo "*** Saving mtree database for future upgrades"
   test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE}
   mv ${MTREENEW} ${DESTDIR}${MTREEFILE}
From maxim at FreeBSD.org  Mon May 25 10:09:06 2009
From: maxim at FreeBSD.org (Maxim Konovalov)
Date: Mon May 25 10:09:18 2009
Subject: svn commit: r192749 - stable/7/share/man/man5
Message-ID: <200905251009.n4PA95AT018952@svn.freebsd.org>

Author: maxim
Date: Mon May 25 10:09:05 2009
New Revision: 192749
URL: http://svn.freebsd.org/changeset/base/192749

Log:
  MFC r191454: correct geli(8) command line.

Modified:
  stable/7/share/man/man5/rc.conf.5

Modified: stable/7/share/man/man5/rc.conf.5
==============================================================================
--- stable/7/share/man/man5/rc.conf.5	Mon May 25 09:57:18 2009	(r192748)
+++ stable/7/share/man/man5/rc.conf.5	Mon May 25 10:09:05 2009	(r192749)
@@ -1466,7 +1466,7 @@ Options passed to the
 .Xr geli 8
 utility when encrypted GEOM providers for swap partitions are created.
 The default is
-.Dq Li "-a aes -l 256 -s 4096 -d" .
+.Dq Li "-e aes -l 256 -s 4096 -d" .
 .It Va root_rw_mount
 .Pq Vt bool
 Set to
From maxim at FreeBSD.org  Mon May 25 10:10:47 2009
From: maxim at FreeBSD.org (Maxim Konovalov)
Date: Mon May 25 10:10:54 2009
Subject: svn commit: r192750 - stable/7/share/man/man4
Message-ID: <200905251010.n4PAAknC019056@svn.freebsd.org>

Author: maxim
Date: Mon May 25 10:10:46 2009
New Revision: 192750
URL: http://svn.freebsd.org/changeset/base/192750

Log:
  MFC r191682: correct ng_hole(4) control messages names.

Modified:
  stable/7/share/man/man4/ng_hole.4

Modified: stable/7/share/man/man4/ng_hole.4
==============================================================================
--- stable/7/share/man/man4/ng_hole.4	Mon May 25 10:09:05 2009	(r192749)
+++ stable/7/share/man/man4/ng_hole.4	Mon May 25 10:10:46 2009	(r192750)
@@ -58,20 +58,20 @@ as long as the name is unique.
 This node type supports the generic control messages, plus the
 following:
 .Bl -tag -width indent
-.It Dv NGM_BPF_GET_STATS
+.It Dv NGM_HOLE_GET_STATS
 This command takes an
 .Tn ASCII
 string argument, the hook name, and returns the statistics
 associated with the hook as a
 .Vt "struct ng_hole_hookstat" .
-.It Dv NGM_BPF_CLR_STATS
+.It Dv NGM_HOLE_CLR_STATS
 This command takes an
 .Tn ASCII
 string argument, the hook name, and clears the statistics
 associated with the hook.
-.It Dv NGM_BPF_GETCLR_STATS
+.It Dv NGM_HOLE_GETCLR_STATS
 This command is identical to
-.Dv NGM_BPF_GET_STATS ,
+.Dv NGM_HOLE_GET_STATS ,
 except that the statistics are also atomically cleared.
 .El
 .Sh SHUTDOWN
From maxim at FreeBSD.org  Mon May 25 10:12:28 2009
From: maxim at FreeBSD.org (Maxim Konovalov)
Date: Mon May 25 10:12:39 2009
Subject: svn commit: r192751 - stable/7/etc
Message-ID: <200905251012.n4PACRgu019157@svn.freebsd.org>

Author: maxim
Date: Mon May 25 10:12:27 2009
New Revision: 192751
URL: http://svn.freebsd.org/changeset/base/192751

Log:
  MFC r192198: add missed semicolon in action script.

Modified:
  stable/7/etc/devd.conf

Modified: stable/7/etc/devd.conf
==============================================================================
--- stable/7/etc/devd.conf	Mon May 25 10:10:46 2009	(r192750)
+++ stable/7/etc/devd.conf	Mon May 25 10:12:27 2009	(r192751)
@@ -130,7 +130,7 @@ attach 100 {
 	match "vendor"	"0x1645";
 	match "product"	"0x8001";
 	match "release"	"0x0101";
-	action "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi /usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/$device-name";
+	action "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi; /usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/$device-name";
 };
 
 # This entry starts the ColdSync tool in daemon mode. Make sure you have an up
From maxim at FreeBSD.org  Mon May 25 10:22:42 2009
From: maxim at FreeBSD.org (Maxim Konovalov)
Date: Mon May 25 10:22:53 2009
Subject: svn commit: r192752 - stable/7/share/misc
Message-ID: <200905251022.n4PAMdFe019576@svn.freebsd.org>

Author: maxim
Date: Mon May 25 10:22:39 2009
New Revision: 192752
URL: http://svn.freebsd.org/changeset/base/192752

Log:
  MFC r191681,191698,191834: NetBSD 5.0, OpenBSD 4.5, FreeBSD 7.2 added.

Modified:
  stable/7/share/misc/bsd-family-tree

Modified: stable/7/share/misc/bsd-family-tree
==============================================================================
--- stable/7/share/misc/bsd-family-tree	Mon May 25 10:12:27 2009	(r192751)
+++ stable/7/share/misc/bsd-family-tree	Mon May 25 10:22:39 2009	(r192752)
@@ -227,6 +227,8 @@ FreeBSD 5.2           |      |          
  |     |              |      |                 |                       |
  |  FreeBSD 7.1       |      |                 |                       |
  |     |              |      |                 |                DragonFly 2.2.0
+ |  FreeBSD 7.2       |   NetBSD 5.0       OpenBSD 4.5                 |
+ |     |              |      |                 |                       |
  |     V              |      |                 |                       |
  |                    |      |                 |                       |
 FreeBSD 8 -current    |  NetBSD -current  OpenBSD -current             |
@@ -496,6 +498,9 @@ OpenBSD 4.4		2008-11-01 [OBD]
 FreeBSD 6.4		2008-11-28 [FBD]
 FreeBSD 7.1		2009-01-04 [FBD]
 DragonFly 2.2.0		2009-02-17 [DFB]
+NetBSD 5.0		2009-04-29 [NBD]
+OpenBSD 4.5		2009-05-01 [OBD]
+FreeBSD 7.2		2009-05-04 [FBD]
 
 Bibliography
 ------------------------
From dchagin at FreeBSD.org  Mon May 25 14:36:22 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Mon May 25 14:36:29 2009
Subject: svn commit: r192759 - in stable/7/sys: . compat/linux contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905251436.n4PEaL72026517@svn.freebsd.org>

Author: dchagin
Date: Mon May 25 14:36:21 2009
New Revision: 192759
URL: http://svn.freebsd.org/changeset/base/192759

Log:
  Merge r191269 from HEAD to stable/7:
  Remove support for FUTEX_REQUEUE operation.
  Glibc does not use this operation since 2.3.3 version (Jun 2004),
  as it is racy and replaced by FUTEX_CMP_REQUEUE operation.
  Glibc versions prior to 2.3.3 fall back to FUTEX_WAKE when
  FUTEX_REQUEUE returned EINVAL.
  
  Any application directly using FUTEX_REQUEUE without return
  value checking are definitely broken.
  
  Limit quantity of messages per process about unsupported
  operation.
  
  Approved by:	kib(mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_emul.c
  stable/7/sys/compat/linux/linux_emul.h
  stable/7/sys/compat/linux/linux_futex.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linux/linux_emul.c
==============================================================================
--- stable/7/sys/compat/linux/linux_emul.c	Mon May 25 13:52:51 2009	(r192758)
+++ stable/7/sys/compat/linux/linux_emul.c	Mon May 25 14:36:21 2009	(r192759)
@@ -86,6 +86,7 @@ linux_proc_init(struct thread *td, pid_t
 		em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO);
 		em->pid = child;
 		em->pdeath_signal = 0;
+		em->used_requeue = 0;
 		em->robust_futexes = NULL;
 		if (flags & LINUX_CLONE_THREAD) {
 			/* handled later in the code */

Modified: stable/7/sys/compat/linux/linux_emul.h
==============================================================================
--- stable/7/sys/compat/linux/linux_emul.h	Mon May 25 13:52:51 2009	(r192758)
+++ stable/7/sys/compat/linux/linux_emul.h	Mon May 25 14:36:21 2009	(r192759)
@@ -51,6 +51,7 @@ struct linux_emuldata {
 	struct linux_emuldata_shared *shared;
 
 	int	pdeath_signal;		/* parent death signal */
+	int	used_requeue;		/* uses deprecated futex op */
 
 	struct	linux_robust_list_head	*robust_futexes;
 

Modified: stable/7/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.c	Mon May 25 13:52:51 2009	(r192758)
+++ stable/7/sys/compat/linux/linux_futex.c	Mon May 25 14:36:21 2009	(r192759)
@@ -114,6 +114,7 @@ linux_sys_futex(struct thread *td, struc
 	struct timeval tv = {0, 0};
 	struct futex *f2;
 	int op_ret;
+	struct linux_emuldata *em;
 
 #ifdef	DEBUG
 	if (ldebug(sys_futex))
@@ -262,19 +263,6 @@ linux_sys_futex(struct thread *td, struc
 		FUTEX_SYSTEM_UNLOCK;
 		break;
 
-	case LINUX_FUTEX_REQUEUE:
-		FUTEX_SYSTEM_LOCK;
-
-		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
-		newf = futex_get(args->uaddr2, FUTEX_UNLOCKED);
-		td->td_retval[0] = futex_wake(f, args->val, newf,
-		    (int)(unsigned long)args->timeout);
-		futex_put(f);
-		futex_put(newf);
-
-		FUTEX_SYSTEM_UNLOCK;
-		break;
-
 	case LINUX_FUTEX_WAKE_OP:
 		FUTEX_SYSTEM_LOCK;
 #ifdef DEBUG
@@ -342,6 +330,23 @@ linux_sys_futex(struct thread *td, struc
 		/* not yet implemented */
 		return (ENOSYS);
 
+	case LINUX_FUTEX_REQUEUE:
+
+		/*
+		 * Glibc does not use this operation since Jun 2004 (2.3.3),
+		 * as it is racy and replaced by FUTEX_CMP_REQUEUE operation.
+		 * Glibc versions prior to 2.3.3 fall back to FUTEX_WAKE when
+		 * FUTEX_REQUEUE returned EINVAL.
+		 */
+		em = em_find(td->td_proc, EMUL_DONTLOCK);
+		if (em->used_requeue == 0) {
+			printf("linux(%s (%d)) sys_futex: "
+			    "unsupported futex_requeue op\n",
+			    td->td_proc->p_comm, td->td_proc->p_pid);
+			em->used_requeue = 1;
+		}
+		return (EINVAL);
+
 	default:
 		printf("linux_sys_futex: unknown op %d\n",
 		    args->op);
From dchagin at FreeBSD.org  Mon May 25 19:55:01 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Mon May 25 19:55:07 2009
Subject: svn commit: r192767 - in stable/7/sys: . compat/linux contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905251955.n4PJt0hq033155@svn.freebsd.org>

Author: dchagin
Date: Mon May 25 19:55:00 2009
New Revision: 192767
URL: http://svn.freebsd.org/changeset/base/192767

Log:
  Merge r191988 from HEAD to stable/7:
  Add forgotten linux to bsd flags argument mapping into the linux_recv().
  
  PR:		kern/134276
  Submitted by:	Thomas Mueller 
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_socket.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/7/sys/compat/linux/linux_socket.c	Mon May 25 17:06:24 2009	(r192766)
+++ stable/7/sys/compat/linux/linux_socket.c	Mon May 25 19:55:00 2009	(r192767)
@@ -871,7 +871,7 @@ linux_recv(struct thread *td, struct lin
 	bsd_args.s = args->s;
 	bsd_args.buf = (caddr_t)PTRIN(args->msg);
 	bsd_args.len = args->len;
-	bsd_args.flags = args->flags;
+	bsd_args.flags = linux_to_bsd_msg_flags(args->flags);
 	bsd_args.from = NULL;
 	bsd_args.fromlenaddr = 0;
 	return (recvfrom(td, &bsd_args));
From dchagin at FreeBSD.org  Mon May 25 20:24:37 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Mon May 25 20:24:54 2009
Subject: svn commit: r192769 - in stable/7/sys: . amd64/linux32 compat/linux
	contrib/pf dev/ath/ath_hal dev/cxgb
Message-ID: <200905252024.n4PKOaPf033912@svn.freebsd.org>

Author: dchagin
Date: Mon May 25 20:24:36 2009
New Revision: 192769
URL: http://svn.freebsd.org/changeset/base/192769

Log:
  Merge r191989 from HEAD to stable/7:
  
  Translate l_timeval arg to native struct timeval in
  linux_setsockopt()/linux_getsockopt() for SO_RCVTIMEO,
  SO_SNDTIMEO opts as l_timeval has MD members.
  
  Remove bogus __packed attribute from l_timeval struct on __amd64__.
  
  PR:		kern/134276
  Submitted by:	Thomas Mueller 
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/linux32/linux.h
  stable/7/sys/compat/linux/linux_socket.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/amd64/linux32/linux.h
==============================================================================
--- stable/7/sys/amd64/linux32/linux.h	Mon May 25 20:07:41 2009	(r192768)
+++ stable/7/sys/amd64/linux32/linux.h	Mon May 25 20:24:36 2009	(r192769)
@@ -94,7 +94,7 @@ typedef struct {
 typedef struct {
 	l_time_t	tv_sec;
 	l_suseconds_t	tv_usec;
-} __packed l_timeval;
+} l_timeval;
 
 #define	l_fd_set	fd_set
 

Modified: stable/7/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/7/sys/compat/linux/linux_socket.c	Mon May 25 20:07:41 2009	(r192768)
+++ stable/7/sys/compat/linux/linux_socket.c	Mon May 25 20:24:36 2009	(r192769)
@@ -1073,6 +1073,8 @@ linux_setsockopt(struct thread *td, stru
 		caddr_t val;
 		int valsize;
 	} */ bsd_args;
+	l_timeval linux_tv;
+	struct timeval tv;
 	int error, name;
 
 	bsd_args.s = args->s;
@@ -1080,6 +1082,23 @@ linux_setsockopt(struct thread *td, stru
 	switch (bsd_args.level) {
 	case SOL_SOCKET:
 		name = linux_to_bsd_so_sockopt(args->optname);
+		switch (name) {
+		case SO_RCVTIMEO:
+			/* FALLTHROUGH */
+		case SO_SNDTIMEO:
+			error = copyin(PTRIN(args->optval), &linux_tv,
+			    sizeof(linux_tv));
+			if (error)
+				return (error);
+			tv.tv_sec = linux_tv.tv_sec;
+			tv.tv_usec = linux_tv.tv_usec;
+			return (kern_setsockopt(td, args->s, bsd_args.level,
+			    name, &tv, UIO_SYSSPACE, sizeof(tv)));
+			/* NOTREACHED */
+			break;
+		default:
+			break;
+		}
 		break;
 	case IPPROTO_IP:
 		name = linux_to_bsd_ip_sockopt(args->optname);
@@ -1128,6 +1147,9 @@ linux_getsockopt(struct thread *td, stru
 		caddr_t val;
 		int *avalsize;
 	} */ bsd_args;
+	l_timeval linux_tv;
+	struct timeval tv;
+	socklen_t tv_len;
 	int error, name;
 
 	bsd_args.s = args->s;
@@ -1135,6 +1157,24 @@ linux_getsockopt(struct thread *td, stru
 	switch (bsd_args.level) {
 	case SOL_SOCKET:
 		name = linux_to_bsd_so_sockopt(args->optname);
+		switch (name) {
+		case SO_RCVTIMEO:
+			/* FALLTHROUGH */
+		case SO_SNDTIMEO:
+			tv_len = sizeof(tv);
+			error = kern_getsockopt(td, args->s, bsd_args.level,
+			    name, &tv, UIO_SYSSPACE, &tv_len);
+			if (error)
+				return (error);
+			linux_tv.tv_sec = tv.tv_sec;
+			linux_tv.tv_usec = tv.tv_usec;
+			return (copyout(&linux_tv, PTRIN(args->optval),
+			    sizeof(linux_tv)));
+			/* NOTREACHED */
+			break;
+		default:
+			break;
+		}
 		break;
 	case IPPROTO_IP:
 		name = linux_to_bsd_ip_sockopt(args->optname);
From dchagin at FreeBSD.org  Mon May 25 20:35:42 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Mon May 25 20:35:59 2009
Subject: svn commit: r192770 - in stable/7/sys: . compat/linux contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905252035.n4PKZgb4034182@svn.freebsd.org>

Author: dchagin
Date: Mon May 25 20:35:41 2009
New Revision: 192770
URL: http://svn.freebsd.org/changeset/base/192770

Log:
  Merge r191880 from HEAD to stable/7:
  
  Change linux struct tms definition to match actual linux one.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_misc.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/7/sys/compat/linux/linux_misc.c	Mon May 25 20:24:36 2009	(r192769)
+++ stable/7/sys/compat/linux/linux_misc.c	Mon May 25 20:35:41 2009	(r192770)
@@ -655,10 +655,10 @@ linux_time(struct thread *td, struct lin
 }
 
 struct l_times_argv {
-	l_long	tms_utime;
-	l_long	tms_stime;
-	l_long	tms_cutime;
-	l_long	tms_cstime;
+	l_clock_t	tms_utime;
+	l_clock_t	tms_stime;
+	l_clock_t	tms_cutime;
+	l_clock_t	tms_cstime;
 };
 
 #define CLK_TCK 100			/* Linux uses 100 */
From dchagin at FreeBSD.org  Tue May 26 13:37:06 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Tue May 26 13:37:23 2009
Subject: svn commit: r192806 - in stable/7/sys: . compat/linux contrib/pf
	dev/ath/ath_hal dev/cxgb modules/linux
Message-ID: <200905261337.n4QDb5rM059605@svn.freebsd.org>

Author: dchagin
Date: Tue May 26 13:37:05 2009
New Revision: 192806
URL: http://svn.freebsd.org/changeset/base/192806

Log:
  Merge r191877 from HEAD to stable/7:
  
  Add preliminary KTR(9) support to the linux emulation layer.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_mib.c
  stable/7/sys/compat/linux/linux_util.h
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/modules/linux/Makefile

Modified: stable/7/sys/compat/linux/linux_mib.c
==============================================================================
--- stable/7/sys/compat/linux/linux_mib.c	Tue May 26 12:01:37 2009	(r192805)
+++ stable/7/sys/compat/linux/linux_mib.c	Tue May 26 13:37:05 2009	(r192806)
@@ -318,7 +318,7 @@ linux_set_oss_version(struct thread *td,
 	return (0);
 }
 
-#ifdef DEBUG
+#if defined(DEBUG) || defined(KTR)
 
 u_char linux_debug_map[howmany(LINUX_SYS_MAXSYSCALL, sizeof(u_char))];
 
@@ -377,4 +377,4 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, deb
             0, 0, linux_sysctl_debug, "A",
             "Linux debugging control");
 
-#endif /* DEBUG */
+#endif /* DEBUG || KTR */

Modified: stable/7/sys/compat/linux/linux_util.h
==============================================================================
--- stable/7/sys/compat/linux/linux_util.h	Tue May 26 12:01:37 2009	(r192805)
+++ stable/7/sys/compat/linux/linux_util.h	Tue May 26 13:37:05 2009	(r192806)
@@ -104,4 +104,33 @@ int	linux_driver_get_major_minor(char *n
 char	*linux_get_char_devices(void);
 void	linux_free_get_char_devices(char *string);
 
+#if defined(KTR)
+
+#define	KTR_LINUX				KTR_SUBSYS
+#define	LINUX_CTRFMT(nm, fmt)	#nm"("fmt")"
+
+#define	LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6) do {			\
+	if (ldebug(f))							\
+		CTR6(KTR_LINUX, LINUX_CTRFMT(f, m),			\
+		    p1, p2, p3, p4, p5, p6);				\
+} while (0)
+
+#define	LINUX_CTR(f)			LINUX_CTR6(f, "", 0, 0, 0, 0, 0, 0)
+#define	LINUX_CTR0(f, m)		LINUX_CTR6(f, m, 0, 0, 0, 0, 0, 0)
+#define	LINUX_CTR1(f, m, p1)		LINUX_CTR6(f, m, p1, 0, 0, 0, 0, 0)
+#define	LINUX_CTR2(f, m, p1, p2)	LINUX_CTR6(f, m, p1, p2, 0, 0, 0, 0)
+#define	LINUX_CTR3(f, m, p1, p2, p3)	LINUX_CTR6(f, m, p1, p2, p3, 0, 0, 0)
+#define	LINUX_CTR4(f, m, p1, p2, p3, p4)	LINUX_CTR6(f, m, p1, p2, p3, p4, 0, 0)
+#define	LINUX_CTR5(f, m, p1, p2, p3, p4, p5)	LINUX_CTR6(f, m, p1, p2, p3, p4, p5, 0)
+#else
+#define	LINUX_CTR(f)
+#define	LINUX_CTR0(f, m)
+#define	LINUX_CTR1(f, m, p1)
+#define	LINUX_CTR2(f, m, p1, p2)
+#define	LINUX_CTR3(f, m, p1, p2, p3)
+#define	LINUX_CTR4(f, m, p1, p2, p3, p4)
+#define	LINUX_CTR5(f, m, p1, p2, p3, p4, p5)
+#define	LINUX_CTR6(f, m, p1, p2, p3, p4, p5, p6)
+#endif
+
 #endif /* !_LINUX_UTIL_H_ */

Modified: stable/7/sys/modules/linux/Makefile
==============================================================================
--- stable/7/sys/modules/linux/Makefile	Tue May 26 12:01:37 2009	(r192805)
+++ stable/7/sys/modules/linux/Makefile	Tue May 26 13:37:05 2009	(r192806)
@@ -55,6 +55,9 @@ linux${SFX}_genassym.o: linux${SFX}_gena
 .if !defined(KERNBUILDDIR)
 opt_inet6.h:
 	echo "#define INET6 1" > opt_inet6.h
+.if defined(KTR)
+CFLAGS+=	-DKTR
+.endif
 .endif
 
 .include 
From jhb at FreeBSD.org  Tue May 26 14:13:13 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 26 14:13:24 2009
Subject: svn commit: r192807 - in stable/7/sys: . amd64/amd64 contrib/pf
	dev/ath/ath_hal dev/cxgb i386/i386
Message-ID: <200905261413.n4QEDCvr060488@svn.freebsd.org>

Author: jhb
Date: Tue May 26 14:13:12 2009
New Revision: 192807
URL: http://svn.freebsd.org/changeset/base/192807

Log:
  MFC:  Adjust the way we number CPUs on x86 so that we attempt to "group" all
  logical CPUs in a package.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/mp_machdep.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/i386/mp_machdep.c

Modified: stable/7/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/mp_machdep.c	Tue May 26 13:37:05 2009	(r192806)
+++ stable/7/sys/amd64/amd64/mp_machdep.c	Tue May 26 14:13:12 2009	(r192807)
@@ -354,7 +354,6 @@ cpu_mp_start(void)
 	} else
 		KASSERT(boot_cpu_id == PCPU_GET(apic_id),
 		    ("BSP's APIC ID doesn't match boot_cpu_id"));
-	cpu_apic_ids[0] = boot_cpu_id;
 
 	/* Setup the initial logical CPUs info. */
 	logical_cpus = logical_cpus_mask = 0;
@@ -421,28 +420,30 @@ cpu_mp_start(void)
 void
 cpu_mp_announce(void)
 {
-	int i, x;
 	const char *hyperthread;
+	int i;
 
-	/* List CPUs */
+	/* List active CPUs first. */
 	printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id);
-	for (i = 1, x = 0; x <= MAX_APIC_ID; x++) {
-		if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp)
+	for (i = 1; i < mp_ncpus; i++) {
+		if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread)
+			hyperthread = "/HT";
+		else
+			hyperthread = "";
+		printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread,
+		    cpu_apic_ids[i]);
+	}
+
+	/* List disabled CPUs last. */
+	for (i = 0; i <= MAX_APIC_ID; i++) {
+		if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled)
 			continue;
-		if (cpu_info[x].cpu_hyperthread) {
+		if (cpu_info[i].cpu_hyperthread)
 			hyperthread = "/HT";
-		} else {
+		else
 			hyperthread = "";
-		}
-		if (cpu_info[x].cpu_disabled)
-			printf("  cpu (AP%s): APIC ID: %2d (disabled)\n",
-			    hyperthread, x);
-		else {
-			KASSERT(i < mp_ncpus,
-			    ("mp_ncpus and actual cpus are out of whack"));
-			printf(" cpu%d (AP%s): APIC ID: %2d\n", i++,
-			    hyperthread, x);
-		}
+		printf("  cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread,
+		    i);
 	}
 }
 
@@ -678,11 +679,18 @@ assign_cpu_ids(void)
 
 	/*
 	 * Assign CPU IDs to local APIC IDs and disable any CPUs
-	 * beyond MAXCPU.  CPU 0 has already been assigned to the BSP,
-	 * so we only have to assign IDs for APs.
+	 * beyond MAXCPU.  CPU 0 is always assigned to the BSP.
+	 *
+	 * To minimize confusion for userland, we attempt to number
+	 * CPUs such that all threads and cores in a package are
+	 * grouped together.  For now we assume that the BSP is always
+	 * the first thread in a package and just start adding APs
+	 * starting with the BSP's APIC ID.
 	 */
 	mp_ncpus = 1;
-	for (i = 0; i <= MAX_APIC_ID; i++) {
+	cpu_apic_ids[0] = boot_cpu_id;
+	for (i = boot_cpu_id + 1; i != boot_cpu_id;
+	     i == MAX_APIC_ID ? i = 0 : i++) {
 		if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp ||
 		    cpu_info[i].cpu_disabled)
 			continue;

Modified: stable/7/sys/i386/i386/mp_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/mp_machdep.c	Tue May 26 13:37:05 2009	(r192806)
+++ stable/7/sys/i386/i386/mp_machdep.c	Tue May 26 14:13:12 2009	(r192807)
@@ -404,7 +404,6 @@ cpu_mp_start(void)
 	} else
 		KASSERT(boot_cpu_id == PCPU_GET(apic_id),
 		    ("BSP's APIC ID doesn't match boot_cpu_id"));
-	cpu_apic_ids[0] = boot_cpu_id;
 
 	/* Setup the initial logical CPUs info. */
 	logical_cpus = logical_cpus_mask = 0;
@@ -471,28 +470,30 @@ cpu_mp_start(void)
 void
 cpu_mp_announce(void)
 {
-	int i, x;
 	const char *hyperthread;
+	int i;
 
-	/* List CPUs */
+	/* List active CPUs first. */
 	printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id);
-	for (i = 1, x = 0; x <= MAX_APIC_ID; x++) {
-		if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp)
+	for (i = 1; i < mp_ncpus; i++) {
+		if (cpu_info[cpu_apic_ids[i]].cpu_hyperthread)
+			hyperthread = "/HT";
+		else
+			hyperthread = "";
+		printf(" cpu%d (AP%s): APIC ID: %2d\n", i, hyperthread,
+		    cpu_apic_ids[i]);
+	}
+
+	/* List disabled CPUs last. */
+	for (i = 0; i <= MAX_APIC_ID; i++) {
+		if (!cpu_info[i].cpu_present || !cpu_info[i].cpu_disabled)
 			continue;
-		if (cpu_info[x].cpu_hyperthread) {
+		if (cpu_info[i].cpu_hyperthread)
 			hyperthread = "/HT";
-		} else {
+		else
 			hyperthread = "";
-		}
-		if (cpu_info[x].cpu_disabled)
-			printf("  cpu (AP%s): APIC ID: %2d (disabled)\n",
-			    hyperthread, x);
-		else {
-			KASSERT(i < mp_ncpus,
-			    ("mp_ncpus and actual cpus are out of whack"));
-			printf(" cpu%d (AP%s): APIC ID: %2d\n", i++,
-			    hyperthread, x);
-		}
+		printf("  cpu (AP%s): APIC ID: %2d (disabled)\n", hyperthread,
+		    i);
 	}
 }
 
@@ -731,11 +732,18 @@ assign_cpu_ids(void)
 
 	/*
 	 * Assign CPU IDs to local APIC IDs and disable any CPUs
-	 * beyond MAXCPU.  CPU 0 has already been assigned to the BSP,
-	 * so we only have to assign IDs for APs.
+	 * beyond MAXCPU.  CPU 0 is always assigned to the BSP.
+	 *
+	 * To minimize confusion for userland, we attempt to number
+	 * CPUs such that all threads and cores in a package are
+	 * grouped together.  For now we assume that the BSP is always
+	 * the first thread in a package and just start adding APs
+	 * starting with the BSP's APIC ID.
 	 */
 	mp_ncpus = 1;
-	for (i = 0; i <= MAX_APIC_ID; i++) {
+	cpu_apic_ids[0] = boot_cpu_id;
+	for (i = boot_cpu_id + 1; i != boot_cpu_id;
+	     i == MAX_APIC_ID ? i = 0 : i++) {
 		if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp ||
 		    cpu_info[i].cpu_disabled)
 			continue;
From jhb at FreeBSD.org  Tue May 26 15:30:33 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 26 15:30:45 2009
Subject: svn commit: r192812 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905261530.n4QFUXHS062219@svn.freebsd.org>

Author: jhb
Date: Tue May 26 15:30:32 2009
New Revision: 192812
URL: http://svn.freebsd.org/changeset/base/192812

Log:
  MFC: Only use the ABI compat shim for vfs.bufspace if the old buffer is
  smaller than a long.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/vfs_bio.c

Modified: stable/7/sys/kern/vfs_bio.c
==============================================================================
--- stable/7/sys/kern/vfs_bio.c	Tue May 26 15:19:04 2009	(r192811)
+++ stable/7/sys/kern/vfs_bio.c	Tue May 26 15:30:32 2009	(r192812)
@@ -291,7 +291,7 @@ sysctl_bufspace(SYSCTL_HANDLER_ARGS)
 	long lvalue;
 	int ivalue;
 
-	if (sizeof(int) == sizeof(long) || req->oldlen == sizeof(long))
+	if (sizeof(int) == sizeof(long) || req->oldlen >= sizeof(long))
 		return (sysctl_handle_long(oidp, arg1, arg2, req));
 	lvalue = *(long *)arg1;
 	if (lvalue > INT_MAX)
From jhb at FreeBSD.org  Tue May 26 15:33:35 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 26 15:33:42 2009
Subject: svn commit: r192813 - in stable/7/sys: . amd64/pci contrib/pf
	dev/ath/ath_hal dev/cxgb i386/pci
Message-ID: <200905261533.n4QFXYBn062344@svn.freebsd.org>

Author: jhb
Date: Tue May 26 15:33:34 2009
New Revision: 192813
URL: http://svn.freebsd.org/changeset/base/192813

Log:
  MFC: Add a read-only sysctl hw.pci.mcfg to mirror the tunable by the same
  name.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/pci/pci_cfgreg.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/pci/pci_cfgreg.c

Modified: stable/7/sys/amd64/pci/pci_cfgreg.c
==============================================================================
--- stable/7/sys/amd64/pci/pci_cfgreg.c	Tue May 26 15:30:32 2009	(r192812)
+++ stable/7/sys/amd64/pci/pci_cfgreg.c	Tue May 26 15:33:34 2009	(r192813)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -56,6 +57,8 @@ static void	pciereg_cfgwrite(int bus, un
 static int	pcireg_cfgread(int bus, int slot, int func, int reg, int bytes);
 static void	pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes);
 
+SYSCTL_DECL(_hw_pci);
+
 static int cfgmech;
 static vm_offset_t pcie_base;
 static int pcie_minbus, pcie_maxbus;
@@ -63,6 +66,8 @@ static uint32_t pcie_badslots;
 static struct mtx pcicfg_mtx;
 static int mcfg_enable = 0;
 TUNABLE_INT("hw.pci.mcfg", &mcfg_enable);
+SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0,
+    "Enable support for PCI-e memory mapped config access");
 
 /* 
  * Initialise access to PCI configuration space 

Modified: stable/7/sys/i386/pci/pci_cfgreg.c
==============================================================================
--- stable/7/sys/i386/pci/pci_cfgreg.c	Tue May 26 15:30:32 2009	(r192812)
+++ stable/7/sys/i386/pci/pci_cfgreg.c	Tue May 26 15:33:34 2009	(r192813)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -75,6 +76,8 @@ enum {
 	CFGMECH_PCIE,
 };
 
+SYSCTL_DECL(_hw_pci);
+
 static TAILQ_HEAD(pcie_cfg_list, pcie_cfg_elem) pcie_list[MAXCPU];
 static uint64_t pcie_base;
 static int pcie_minbus, pcie_maxbus;
@@ -84,6 +87,8 @@ static int devmax;
 static struct mtx pcicfg_mtx;
 static int mcfg_enable = 0;
 TUNABLE_INT("hw.pci.mcfg", &mcfg_enable);
+SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0,
+    "Enable support for PCI-e memory mapped config access");
 
 static uint32_t	pci_docfgregread(int bus, int slot, int func, int reg,
 		    int bytes);
From jhb at FreeBSD.org  Tue May 26 16:01:52 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Tue May 26 16:01:59 2009
Subject: svn commit: r192815 - in stable/7/sys: . amd64/amd64 arm/arm
	contrib/pf dev/ath/ath_hal dev/cxgb i386/i386
Message-ID: <200905261601.n4QG1pDr063899@svn.freebsd.org>

Author: jhb
Date: Tue May 26 16:01:50 2009
New Revision: 192815
URL: http://svn.freebsd.org/changeset/base/192815

Log:
  MFC:  Reduce the number of bounce zones (and thus the number of bounce
  pages) used in some cases.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/amd64/busdma_machdep.c
  stable/7/sys/arm/arm/busdma_machdep.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/i386/busdma_machdep.c

Modified: stable/7/sys/amd64/amd64/busdma_machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/busdma_machdep.c	Tue May 26 15:49:09 2009	(r192814)
+++ stable/7/sys/amd64/amd64/busdma_machdep.c	Tue May 26 16:01:50 2009	(r192815)
@@ -94,7 +94,6 @@ struct bounce_zone {
 	int		total_bounced;
 	int		total_deferred;
 	bus_size_t	alignment;
-	bus_size_t	boundary;
 	bus_addr_t	lowaddr;
 	char		zoneid[8];
 	char		lowaddrid[20];
@@ -974,7 +973,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	/* Check to see if we already have a suitable zone */
 	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
 		if ((dmat->alignment <= bz->alignment)
-		 && (dmat->boundary <= bz->boundary)
 		 && (dmat->lowaddr >= bz->lowaddr)) {
 			dmat->bounce_zone = bz;
 			return (0);
@@ -990,8 +988,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	bz->reserved_bpages = 0;
 	bz->active_bpages = 0;
 	bz->lowaddr = dmat->lowaddr;
-	bz->alignment = dmat->alignment;
-	bz->boundary = dmat->boundary;
+	bz->alignment = MAX(dmat->alignment, PAGE_SIZE);
 	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
 	busdma_zonecount++;
 	snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr);
@@ -1037,9 +1034,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "boundary", CTLFLAG_RD, &bz->boundary, 0, "");
 
 	return (0);
 }
@@ -1064,7 +1058,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u
 							 M_NOWAIT, 0ul,
 							 bz->lowaddr,
 							 PAGE_SIZE,
-							 bz->boundary);
+							 0);
 		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;

Modified: stable/7/sys/arm/arm/busdma_machdep.c
==============================================================================
--- stable/7/sys/arm/arm/busdma_machdep.c	Tue May 26 15:49:09 2009	(r192814)
+++ stable/7/sys/arm/arm/busdma_machdep.c	Tue May 26 16:01:50 2009	(r192815)
@@ -113,7 +113,6 @@ struct bounce_zone {
 	int		total_bounced;
 	int		total_deferred;
 	bus_size_t	alignment;
-	bus_size_t	boundary;
 	bus_addr_t	lowaddr;
 	char		zoneid[8];
 	char		lowaddrid[20];
@@ -683,10 +682,10 @@ _bus_dmamap_count_pages(bus_dma_tag_t dm
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
-			if (pmap != NULL)
-				paddr = pmap_extract(pmap, vaddr);
-			else
+			if (__predict_true(pmap == pmap_kernel()))
 				paddr = pmap_kextract(vaddr);
+			else
+				paddr = pmap_extract(pmap, vaddr);
 			if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
 			    run_filter(dmat, paddr) != 0)
 				map->pagesneeded++;
@@ -1259,7 +1258,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	/* Check to see if we already have a suitable zone */
 	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
 		if ((dmat->alignment <= bz->alignment)
-		 && (dmat->boundary <= bz->boundary)
 		 && (dmat->lowaddr >= bz->lowaddr)) {
 			dmat->bounce_zone = bz;
 			return (0);
@@ -1275,8 +1273,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	bz->reserved_bpages = 0;
 	bz->active_bpages = 0;
 	bz->lowaddr = dmat->lowaddr;
-	bz->alignment = dmat->alignment;
-	bz->boundary = dmat->boundary;
+	bz->alignment = MAX(dmat->alignment, PAGE_SIZE);
 	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
 	busdma_zonecount++;
 	snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr);
@@ -1322,9 +1319,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "boundary", CTLFLAG_RD, &bz->boundary, 0, "");
 
 	return (0);
 }
@@ -1349,7 +1343,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u
 							 M_NOWAIT, 0ul,
 							 bz->lowaddr,
 							 PAGE_SIZE,
-							 bz->boundary);
+							 0);
 		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;

Modified: stable/7/sys/i386/i386/busdma_machdep.c
==============================================================================
--- stable/7/sys/i386/i386/busdma_machdep.c	Tue May 26 15:49:09 2009	(r192814)
+++ stable/7/sys/i386/i386/busdma_machdep.c	Tue May 26 16:01:50 2009	(r192815)
@@ -99,7 +99,6 @@ struct bounce_zone {
 	int		total_bounced;
 	int		total_deferred;
 	bus_size_t	alignment;
-	bus_size_t	boundary;
 	bus_addr_t	lowaddr;
 	char		zoneid[8];
 	char		lowaddrid[20];
@@ -987,7 +986,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	/* Check to see if we already have a suitable zone */
 	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
 		if ((dmat->alignment <= bz->alignment)
-		 && (dmat->boundary <= bz->boundary)
 		 && (dmat->lowaddr >= bz->lowaddr)) {
 			dmat->bounce_zone = bz;
 			return (0);
@@ -1003,8 +1001,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	bz->reserved_bpages = 0;
 	bz->active_bpages = 0;
 	bz->lowaddr = dmat->lowaddr;
-	bz->alignment = dmat->alignment;
-	bz->boundary = dmat->boundary;
+	bz->alignment = MAX(dmat->alignment, PAGE_SIZE);
 	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
 	busdma_zonecount++;
 	snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr);
@@ -1050,9 +1047,6 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "alignment", CTLFLAG_RD, &bz->alignment, 0, "");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "boundary", CTLFLAG_RD, &bz->boundary, 0, "");
 
 	return (0);
 }
@@ -1077,7 +1071,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u
 							 M_NOWAIT, 0ul,
 							 bz->lowaddr,
 							 PAGE_SIZE,
-							 bz->boundary);
+							 0);
 		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;
From rdivacky at FreeBSD.org  Tue May 26 16:16:02 2009
From: rdivacky at FreeBSD.org (Roman Divacky)
Date: Tue May 26 16:16:08 2009
Subject: svn commit: r192806 - in stable/7/sys: . compat/linux
	contrib/pf dev/ath/ath_hal dev/cxgb modules/linux
In-Reply-To: <200905261337.n4QDb5rM059605@svn.freebsd.org>
References: <200905261337.n4QDb5rM059605@svn.freebsd.org>
Message-ID: <20090526155637.GA18075@freebsd.org>

On Tue, May 26, 2009 at 01:37:05PM +0000, Dmitry Chagin wrote:
> Author: dchagin
> Date: Tue May 26 13:37:05 2009
> New Revision: 192806
> URL: http://svn.freebsd.org/changeset/base/192806
> 
> Log:
>   Merge r191877 from HEAD to stable/7:
>   
>   Add preliminary KTR(9) support to the linux emulation layer.

this is probably just bad wording but if it's preliminary why MFC it?
From des at FreeBSD.org  Tue May 26 21:40:16 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Tue May 26 21:40:28 2009
Subject: svn commit: r192860 - stable/7/usr.bin/kdump
Message-ID: <200905262140.n4QLeFNA074598@svn.freebsd.org>

Author: des
Date: Tue May 26 21:40:15 2009
New Revision: 192860
URL: http://svn.freebsd.org/changeset/base/192860

Log:
  MFC r175936: add shebang.

Modified:
  stable/7/usr.bin/kdump/   (props changed)
  stable/7/usr.bin/kdump/mkioctls
  stable/7/usr.bin/kdump/mksubr

Modified: stable/7/usr.bin/kdump/mkioctls
==============================================================================
--- stable/7/usr.bin/kdump/mkioctls	Tue May 26 21:39:09 2009	(r192859)
+++ stable/7/usr.bin/kdump/mkioctls	Tue May 26 21:40:15 2009	(r192860)
@@ -1,7 +1,9 @@
-set -e
-
+#!/bin/sh
+#
 # $FreeBSD$
 
+set -e
+
 if [ "x$1" = "x-s" ]; then
 	use_switch=1
 	shift
@@ -65,13 +67,13 @@ BEGIN {
 }
 
 /^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO/ {
-	
+
 	# find where the name starts
 	for (i = 1; i <= NF; i++)
 		if ($i ~ /define/)
 			break;
 	++i;
-	# 
+	#
 	if (use_switch)
 		printf("\tcase %s:\n\t\treturn(\"%s\");\n", $i, $i);
 	else

Modified: stable/7/usr.bin/kdump/mksubr
==============================================================================
--- stable/7/usr.bin/kdump/mksubr	Tue May 26 21:39:09 2009	(r192859)
+++ stable/7/usr.bin/kdump/mksubr	Tue May 26 21:40:15 2009	(r192860)
@@ -1,5 +1,7 @@
-set -e
-
+#!/bin/sh
+#
+# $FreeBSD$
+#
 # Generates kdump_subr.c
 # mkioctls is a special-purpose script, and works fine as it is
 # now, so it remains independent. The idea behind how it generates
@@ -16,7 +18,7 @@ set -e
 # that the auto_*_type() functions are inappropriate for.
 # MANUAL: Manually entered and must therefore be manually updated.
 
-# $FreeBSD$
+set -e
 
 LC_ALL=C; export LC_ALL
 
@@ -427,7 +429,7 @@ void
 sendrecvflagsname (int flags)
 {
 	int	or = 0;
-	
+
 	if (flags == 0) {
 		(void)printf("0");
 		return;
From bmah at FreeBSD.org  Wed May 27 03:51:05 2009
From: bmah at FreeBSD.org (Bruce A. Mah)
Date: Wed May 27 03:51:11 2009
Subject: svn commit: r192872 - stable/7/release/doc/en_US.ISO8859-1/relnotes
Message-ID: <200905270351.n4R3p4ln082827@svn.freebsd.org>

Author: bmah
Date: Wed May 27 03:51:04 2009
New Revision: 192872
URL: http://svn.freebsd.org/changeset/base/192872

Log:
  New release note:  ZFS version 13.

Modified:
  stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml

Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml
==============================================================================
--- stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Wed May 27 02:49:08 2009	(r192871)
+++ stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml	Wed May 27 03:51:04 2009	(r192872)
@@ -141,8 +141,6 @@
       
 	Hardware Support
 
-	
-
 	
 	  Multimedia Support
 
@@ -174,7 +172,15 @@
       
 	File Systems
 
-	
+	ZFS has been updated from version 6 to version 13.
+	  This update includes numerous new ZFS features, such as
+	  permitting non-root users to perform
+	  some administrative functions, supporting additional disks
+	  for caching or the ZFS Intent Log, and partial &man.chflags.2;
+	  support.  It also includes some &os;-specific additions,
+	  such as booting from ZFS file systems, removal of ARC
+	  size limitations, ARC backpressure (which allows ZFS to work
+	  without tunables on &arch.amd64;), and many bugfixes.
       
     
 
From dchagin at freebsd.org  Wed May 27 04:30:46 2009
From: dchagin at freebsd.org (Chagin Dmitry)
Date: Wed May 27 04:30:52 2009
Subject: svn commit: r192806 - in stable/7/sys: . compat/linux
	contrib/pf dev/ath/ath_hal dev/cxgb modules/linux
In-Reply-To: <20090526155637.GA18075@freebsd.org>
References: <200905261337.n4QDb5rM059605@svn.freebsd.org>
	<20090526155637.GA18075@freebsd.org>
Message-ID: <20090527041321.GA3094@dchagin.static.corbina.ru>

On Tue, May 26, 2009 at 05:56:37PM +0200, Roman Divacky wrote:
> On Tue, May 26, 2009 at 01:37:05PM +0000, Dmitry Chagin wrote:
> > Author: dchagin
> > Date: Tue May 26 13:37:05 2009
> > New Revision: 192806
> > URL: http://svn.freebsd.org/changeset/base/192806
> > 
> > Log:
> >   Merge r191877 from HEAD to stable/7:
> >   
> >   Add preliminary KTR(9) support to the linux emulation layer.
> 
> this is probably just bad wording but if it's preliminary why MFC it?

Others merge depends on this.

-- 
Have fun!
chd
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-stable-7/attachments/20090527/74920abf/attachment.pgp
From brueffer at FreeBSD.org  Wed May 27 11:03:16 2009
From: brueffer at FreeBSD.org (Christian Brueffer)
Date: Wed May 27 11:03:22 2009
Subject: svn commit: r192889 - in stable/7/sys: . compat/ndis contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905271103.n4RB3Fmf094987@svn.freebsd.org>

Author: brueffer
Date: Wed May 27 11:03:14 2009
New Revision: 192889
URL: http://svn.freebsd.org/changeset/base/192889

Log:
  MFC: r192036
  
  Fix memory leak in an error case.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/ndis/kern_windrv.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/ndis/kern_windrv.c
==============================================================================
--- stable/7/sys/compat/ndis/kern_windrv.c	Wed May 27 10:27:14 2009	(r192888)
+++ stable/7/sys/compat/ndis/kern_windrv.c	Wed May 27 11:03:14 2009	(r192889)
@@ -527,7 +527,10 @@ windrv_bus_attach(drv, name)
 
 	RtlInitAnsiString(&as, name);
 	if (RtlAnsiStringToUnicodeString(&drv->dro_drivername, &as, TRUE))
+	{
+		free(new, M_DEVBUF);
 		return(ENOMEM);
+	}
 
 	/*
 	 * Set up a fake image pointer to avoid false matches
From edwin at FreeBSD.org  Wed May 27 12:33:59 2009
From: edwin at FreeBSD.org (Edwin Groothuis)
Date: Wed May 27 12:34:10 2009
Subject: svn commit: r192892 - in stable/7/tools/regression: . bin/date
Message-ID: <200905271233.n4RCXwLO097022@svn.freebsd.org>

Author: edwin
Date: Wed May 27 12:33:57 2009
New Revision: 192892
URL: http://svn.freebsd.org/changeset/base/192892

Log:
  MFC of r192482:
  
  Add regression tests for the date(1) + argument for user-defined
  format strings.
  
  PR:		bin/127514

Added:
  stable/7/tools/regression/bin/date/
     - copied from r192482, head/tools/regression/bin/date/
Modified:
  stable/7/tools/regression/README

Modified: stable/7/tools/regression/README
==============================================================================
--- stable/7/tools/regression/README	Wed May 27 12:31:55 2009	(r192891)
+++ stable/7/tools/regression/README	Wed May 27 12:33:57 2009	(r192892)
@@ -86,3 +86,4 @@ sysvmsg 	SysV IPC Message Queue Regressi
 sysvsem 	SysV IPC Semaphore Regression Utility
 sysvshm 	SysV IPC Shared Memory Regression Utility
 gaithrstress	General threaded getaddrinfo(3) exerciser
+date		Date(1) + format string regression test
From dchagin at FreeBSD.org  Thu May 28 04:00:04 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Thu May 28 04:00:30 2009
Subject: svn commit: r192950 - in stable/7/sys: . compat/linux contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905280400.n4S403NM021811@svn.freebsd.org>

Author: dchagin
Date: Thu May 28 04:00:03 2009
New Revision: 192950
URL: http://svn.freebsd.org/changeset/base/192950

Log:
  Merge r191972 from HEAD to stable/7:
  
  Introduce linux_kernver() interface which is intended for an exact
  designation of the emulated kernel version.
  
  linux_kernver() returns integer value formatted as 'VVVMMMIII' where
  VVV - version, MMM - major revision, III - minor revision.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_mib.c
  stable/7/sys/compat/linux/linux_mib.h
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linux/linux_mib.c
==============================================================================
--- stable/7/sys/compat/linux/linux_mib.c	Thu May 28 02:39:07 2009	(r192949)
+++ stable/7/sys/compat/linux/linux_mib.c	Thu May 28 04:00:03 2009	(r192950)
@@ -52,7 +52,7 @@ struct linux_prison {
 	char	pr_osname[LINUX_MAX_UTSNAME];
 	char	pr_osrelease[LINUX_MAX_UTSNAME];
 	int	pr_oss_version;
-	int	pr_use_linux26;	/* flag to determine whether to use 2.6 emulation */
+	int	pr_osrel;
 };
 
 SYSCTL_NODE(_compat, OID_AUTO, linux, CTLFLAG_RW, 0,
@@ -83,7 +83,7 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, osn
 	    "Linux kernel OS name");
 
 static char	linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2";
-static int	linux_use_linux26 = 0;
+static int	linux_osrel = 2004002;
 
 static int
 linux_sysctl_osrelease(SYSCTL_HANDLER_ARGS)
@@ -126,6 +126,37 @@ SYSCTL_PROC(_compat_linux, OID_AUTO, oss
 	    "Linux OSS version");
 
 /*
+ * Map the osrelease into integer
+ */
+static int
+linux_map_osrel(char *osrelease, int *osrel)
+{
+	char *sep, *eosrelease;
+	int len, v0, v1, v2, v;
+
+	len = strlen(osrelease);
+	eosrelease = osrelease + len;
+	v0 = strtol(osrelease, &sep, 10);
+	if (osrelease == sep || sep + 1 >= eosrelease || *sep != '.')
+		return (EINVAL);
+	osrelease = sep + 1;
+	v1 = strtol(osrelease, &sep, 10);
+	if (osrelease == sep || sep + 1 >= eosrelease || *sep != '.')
+		return (EINVAL);
+	osrelease = sep + 1;
+	v2 = strtol(osrelease, &sep, 10);
+	if (osrelease == sep || sep != eosrelease)
+		return (EINVAL);
+
+	v = v0 * 1000000 + v1 * 1000 + v2;
+	if (v < 1000000)
+		return (EINVAL);
+
+	*osrel = v;
+	return (0);
+}
+
+/*
  * Returns holding the prison mutex if return non-NULL.
  */
 static struct prison *
@@ -229,21 +260,21 @@ linux_get_osrelease(struct thread *td, c
 }
 
 int
-linux_use26(struct thread *td)
+linux_kernver(struct thread *td)
 {
 	struct prison *pr;
 	struct linux_prison *lpr;
-	int use26 = linux_use_linux26;
+	int osrel;
 
 	pr = td->td_ucred->cr_prison;
 	if (pr != NULL) {
 		if (pr->pr_linux != NULL) {
 			lpr = (struct linux_prison *)pr->pr_linux;
-			use26 = lpr->pr_use_linux26;
+			osrel = lpr->pr_osrel;
 		}
-	}
-	
-	return (use26);
+	} else
+		osrel = linux_osrel;
+	return (osrel);
 }
 
 int
@@ -251,20 +282,26 @@ linux_set_osrelease(struct thread *td, c
 {
 	struct prison *pr;
 	struct linux_prison *lpr;
-	int use26;
-
-	use26 = (strlen(osrelease) >= 3 && osrelease[2] == '6');
+	int error;
 
 	pr = linux_get_prison(td);
 	if (pr != NULL) {
 		lpr = (struct linux_prison *)pr->pr_linux;
+		error = linux_map_osrel(osrelease, &lpr->pr_osrel);
+		if (error) {
+			mtx_unlock(&pr->pr_mtx);
+			return (error);
+		}
 		strcpy(lpr->pr_osrelease, osrelease);
-		lpr->pr_use_linux26 = use26;
 		mtx_unlock(&pr->pr_mtx);
 	} else {
 		mtx_lock(&osname_lock);
+		error = linux_map_osrel(osrelease, &linux_osrel);
+		if (error) {
+			mtx_unlock(&osname_lock);
+			return (error);
+		}
 		strcpy(linux_osrelease, osrelease);
-		linux_use_linux26 = use26;
 		mtx_unlock(&osname_lock);
 	}
 

Modified: stable/7/sys/compat/linux/linux_mib.h
==============================================================================
--- stable/7/sys/compat/linux/linux_mib.h	Thu May 28 02:39:07 2009	(r192949)
+++ stable/7/sys/compat/linux/linux_mib.h	Thu May 28 04:00:03 2009	(r192950)
@@ -40,6 +40,10 @@ int	linux_set_osrelease(struct thread *t
 int	linux_get_oss_version(struct thread *td);
 int	linux_set_oss_version(struct thread *td, int oss_version);
 
-int	linux_use26(struct thread *td);
+int	linux_kernver(struct thread *td);
+
+#define	LINUX_KERNVER_2006000		2006000
+
+#define	linux_use26(t)		(linux_kernver(t) >= LINUX_KERNVER_2006000)
 
 #endif /* _LINUX_MIB_H_ */
From dchagin at FreeBSD.org  Thu May 28 04:08:08 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Thu May 28 04:08:14 2009
Subject: svn commit: r192952 - in stable/7/sys: . compat/linux contrib/pf
	dev/ath/ath_hal dev/cxgb
Message-ID: <200905280408.n4S487g6022044@svn.freebsd.org>

Author: dchagin
Date: Thu May 28 04:08:07 2009
New Revision: 192952
URL: http://svn.freebsd.org/changeset/base/192952

Log:
  Merge r192373 from HEAD to stable/7:
  
  Validate user-supplied arguments values.
  Args argument is a pointer to the structure located in user space in
  which the socketcall arguments are packed. The structure must be
  copied to the kernel instead of direct dereferencing.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_socket.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/7/sys/compat/linux/linux_socket.c	Thu May 28 04:03:16 2009	(r192951)
+++ stable/7/sys/compat/linux/linux_socket.c	Thu May 28 04:08:07 2009	(r192952)
@@ -1203,11 +1203,38 @@ linux_getsockopt(struct thread *td, stru
 	return (error);
 }
 
+/* Argument list sizes for linux_socketcall */
+
+#define LINUX_AL(x) ((x) * sizeof(l_ulong))
+
+static const unsigned char lxs_args[] = {
+	LINUX_AL(0) /* unused*/,	LINUX_AL(3) /* socket */,
+	LINUX_AL(3) /* bind */,		LINUX_AL(3) /* connect */,
+	LINUX_AL(2) /* listen */,	LINUX_AL(3) /* accept */,
+	LINUX_AL(3) /* getsockname */,	LINUX_AL(3) /* getpeername */,
+	LINUX_AL(4) /* socketpair */,	LINUX_AL(4) /* send */,
+	LINUX_AL(4) /* recv */,		LINUX_AL(6) /* sendto */,
+	LINUX_AL(6) /* recvfrom */,	LINUX_AL(2) /* shutdown */,
+	LINUX_AL(5) /* setsockopt */,	LINUX_AL(5) /* getsockopt */,
+	LINUX_AL(3) /* sendmsg */,	LINUX_AL(3) /* recvmsg */
+};
+
+#define	LINUX_AL_SIZE	sizeof(lxs_args) / sizeof(lxs_args[0]) - 1
+
 int
 linux_socketcall(struct thread *td, struct linux_socketcall_args *args)
 {
-	void *arg = (void *)(intptr_t)args->args;
+	l_ulong a[6];
+	void *arg;
+	int error;
+
+	if (args->what < LINUX_SOCKET || args->what > LINUX_AL_SIZE)
+		return (EINVAL);
+	error = copyin(PTRIN(args->args), a, lxs_args[args->what]);
+	if (error)
+		return (error);
 
+	arg = a;
 	switch (args->what) {
 	case LINUX_SOCKET:
 		return (linux_socket(td, arg));
From kmacy at FreeBSD.org  Thu May 28 07:37:50 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Thu May 28 07:38:02 2009
Subject: svn commit: r192969 - stable/7/sys/boot/i386/libi386
Message-ID: <200905280737.n4S7bout027317@svn.freebsd.org>

Author: kmacy
Date: Thu May 28 07:37:49 2009
New Revision: 192969
URL: http://svn.freebsd.org/changeset/base/192969

Log:
  MFC 185095
  
  r185095 | dfr | 2008-11-19 08:04:07 -0800 (Wed, 19 Nov 2008) | 3 lines
  
  If we free the GPT partition list in bd_open_gpt() because of an error, don't
  try to free it again in bd_closedisk(). While I'm here, fix a DEBUG print.

Modified:
  stable/7/sys/boot/i386/libi386/biosdisk.c

Modified: stable/7/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- stable/7/sys/boot/i386/libi386/biosdisk.c	Thu May 28 07:26:36 2009	(r192968)
+++ stable/7/sys/boot/i386/libi386/biosdisk.c	Thu May 28 07:37:49 2009	(r192969)
@@ -996,8 +996,10 @@ bd_open_gpt(struct open_disk *od, struct
     od->od_boff = gp->gp_start;
 
 out:
-    if (error)
+    if (error) {
 	free(od->od_partitions);
+	od->od_flags &= ~BD_GPTOK;
+    }
     return (error);
 }
 
@@ -1088,7 +1090,7 @@ bd_realstrategy(void *devdata, int rw, d
 
     switch(rw){
     case F_READ:
-	DEBUG("read %d from %d to %p", blks, dblk, buf);
+	DEBUG("read %d from %lld to %p", blks, dblk, buf);
 
 	if (blks && bd_read(od, dblk, blks, buf)) {
 	    DEBUG("read error");
From jhb at FreeBSD.org  Thu May 28 14:48:11 2009
From: jhb at FreeBSD.org (John Baldwin)
Date: Thu May 28 14:48:22 2009
Subject: svn commit: r192975 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb dev/mpt
Message-ID: <200905281448.n4SEmBWh040733@svn.freebsd.org>

Author: jhb
Date: Thu May 28 14:48:10 2009
New Revision: 192975
URL: http://svn.freebsd.org/changeset/base/192975

Log:
  MFC: Largely revert the earlier change to use a single CCB for the RAID
  recovery thread.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/mpt/mpt_raid.c

Modified: stable/7/sys/dev/mpt/mpt_raid.c
==============================================================================
--- stable/7/sys/dev/mpt/mpt_raid.c	Thu May 28 13:16:23 2009	(r192974)
+++ stable/7/sys/dev/mpt/mpt_raid.c	Thu May 28 14:48:10 2009	(r192975)
@@ -658,19 +658,19 @@ mpt_terminate_raid_thread(struct mpt_sof
 static void
 mpt_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb)
 {
+
 	xpt_free_path(ccb->ccb_h.path);
+	xpt_free_ccb(ccb);
 }
 
 static void
 mpt_raid_thread(void *arg)
 {
 	struct mpt_softc *mpt;
-	union ccb *ccb;
 	int firstrun;
 
 	mpt = (struct mpt_softc *)arg;
 	firstrun = 1;
-	ccb = xpt_alloc_ccb();
 	MPT_LOCK(mpt);
 	while (mpt->shutdwn_raid == 0) {
 
@@ -698,15 +698,21 @@ mpt_raid_thread(void *arg)
 		}
 
 		if (mpt->raid_rescan != 0) {
+			union ccb *ccb;
 			struct cam_path *path;
 			int error;
 
 			mpt->raid_rescan = 0;
+			MPT_UNLOCK(mpt);
 
+			ccb = xpt_alloc_ccb();
+
+			MPT_LOCK(mpt);
 			error = xpt_create_path(&path, xpt_periph,
 			    cam_sim_path(mpt->phydisk_sim),
 			    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
 			if (error != CAM_REQ_CMP) {
+				xpt_free_ccb(ccb);
 				mpt_prt(mpt, "Unable to rescan RAID Bus!\n");
 			} else {
 				xpt_setup_ccb(&ccb->ccb_h, path, 5);
@@ -719,7 +725,6 @@ mpt_raid_thread(void *arg)
 			}
 		}
 	}
-	xpt_free_ccb(ccb);
 	mpt->raid_thread = NULL;
 	wakeup(&mpt->raid_thread);
 	MPT_UNLOCK(mpt);
From dchagin at FreeBSD.org  Thu May 28 16:05:23 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Thu May 28 16:05:30 2009
Subject: svn commit: r192981 - stable/7/sys/compat/linux
Message-ID: <200905281605.n4SG5NQw042738@svn.freebsd.org>

Author: dchagin
Date: Thu May 28 16:05:22 2009
New Revision: 192981
URL: http://svn.freebsd.org/changeset/base/192981

Log:
  Direct commit. Fix error introduced in my r192950 merge.
  Osrel variable should be initialized before use.
  
  Pointyhat to:	me
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/compat/linux/linux_mib.c

Modified: stable/7/sys/compat/linux/linux_mib.c
==============================================================================
--- stable/7/sys/compat/linux/linux_mib.c	Thu May 28 15:41:41 2009	(r192980)
+++ stable/7/sys/compat/linux/linux_mib.c	Thu May 28 16:05:22 2009	(r192981)
@@ -267,11 +267,9 @@ linux_kernver(struct thread *td)
 	int osrel;
 
 	pr = td->td_ucred->cr_prison;
-	if (pr != NULL) {
-		if (pr->pr_linux != NULL) {
-			lpr = (struct linux_prison *)pr->pr_linux;
-			osrel = lpr->pr_osrel;
-		}
+	if (pr != NULL && pr->pr_linux != NULL) {
+		lpr = (struct linux_prison *)pr->pr_linux;
+		osrel = lpr->pr_osrel;
 	} else
 		osrel = linux_osrel;
 	return (osrel);
From kib at FreeBSD.org  Thu May 28 16:08:34 2009
From: kib at FreeBSD.org (Konstantin Belousov)
Date: Thu May 28 16:08:48 2009
Subject: svn commit: r192982 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb kern
Message-ID: <200905281608.n4SG8XHP042841@svn.freebsd.org>

Author: kib
Date: Thu May 28 16:08:33 2009
New Revision: 192982
URL: http://svn.freebsd.org/changeset/base/192982

Log:
  MFC r191895:
  Eliminate the loop and the call to pause(9) in vfs_vget_ino().
  
  Tested by:	Mykola Dzham 

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/vfs_vnops.c

Modified: stable/7/sys/kern/vfs_vnops.c
==============================================================================
--- stable/7/sys/kern/vfs_vnops.c	Thu May 28 16:05:22 2009	(r192981)
+++ stable/7/sys/kern/vfs_vnops.c	Thu May 28 16:08:33 2009	(r192982)
@@ -1226,26 +1226,30 @@ int
 vn_vget_ino(struct vnode *vp, ino_t ino, int lkflags, struct vnode **rvp)
 {
 	struct mount *mp;
+	struct thread *td;
 	int ltype, error;
 
 	mp = vp->v_mount;
-	ltype = VOP_ISLOCKED(vp, curthread);
+	td = curthread;
+	ltype = VOP_ISLOCKED(vp, td);
 	KASSERT(ltype == LK_EXCLUSIVE || ltype == LK_SHARED,
 	    ("vn_vget_ino: vp not locked"));
-	for (;;) {
-		error = vfs_busy(mp, LK_NOWAIT, NULL, curthread);
-		if (error == 0)
-			break;
-		VOP_UNLOCK(vp, 0, curthread);
-		pause("vn_vget", 1);
-		vn_lock(vp, ltype | LK_RETRY, curthread);
-		if (vp->v_iflag & VI_DOOMED)
+	error = vfs_busy(mp, LK_NOWAIT, NULL, td);
+	if (error != 0) {
+		VOP_UNLOCK(vp, 0, td);
+		error = vfs_busy(mp, 0, NULL, td);
+		vn_lock(vp, ltype | LK_RETRY, td);
+		if (error != 0)
+			return (ENOENT);
+		if (vp->v_iflag & VI_DOOMED) {
+			vfs_unbusy(mp, td);
 			return (ENOENT);
+		}
 	}
-	VOP_UNLOCK(vp, 0, curthread);
+	VOP_UNLOCK(vp, 0, td);
 	error = VFS_VGET(mp, ino, lkflags, rvp);
-	vfs_unbusy(mp, curthread);
-	vn_lock(vp, ltype | LK_RETRY, curthread);
+	vfs_unbusy(mp, td);
+	vn_lock(vp, ltype | LK_RETRY, td);
 	if (vp->v_iflag & VI_DOOMED) {
 		if (error == 0)
 			vput(*rvp);
From des at FreeBSD.org  Thu May 28 17:36:47 2009
From: des at FreeBSD.org (Dag-Erling Smorgrav)
Date: Thu May 28 17:37:01 2009
Subject: svn commit: r192985 - stable/7/sys/cddl/boot/zfs
Message-ID: <200905281736.n4SHajUp044864@svn.freebsd.org>

Author: des
Date: Thu May 28 17:36:44 2009
New Revision: 192985
URL: http://svn.freebsd.org/changeset/base/192985

Log:
  Expand keywords.

Modified:
  stable/7/sys/cddl/boot/zfs/zfssubr.c   (contents, props changed)

Modified: stable/7/sys/cddl/boot/zfs/zfssubr.c
==============================================================================
--- stable/7/sys/cddl/boot/zfs/zfssubr.c	Thu May 28 17:36:36 2009	(r192984)
+++ stable/7/sys/cddl/boot/zfs/zfssubr.c	Thu May 28 17:36:44 2009	(r192985)
@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: stable/7/sys/cddl/boot/zfs/zfssubr.c 192202 2009-05-16 18:08:28Z kmacy $");
+__FBSDID("$FreeBSD$");
 
 static uint64_t zfs_crc64_table[256];
 
From dchagin at FreeBSD.org  Thu May 28 18:26:20 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Thu May 28 18:26:26 2009
Subject: svn commit: r192987 - in stable/7/sys: . amd64/linux32 compat/linux
	contrib/pf dev/ath/ath_hal dev/cxgb i386/linux
Message-ID: <200905281826.n4SIQJ3D046065@svn.freebsd.org>

Author: dchagin
Date: Thu May 28 18:26:18 2009
New Revision: 192987
URL: http://svn.freebsd.org/changeset/base/192987

Log:
  Merge r191883,191966,191973 from HEAD to stable/7:
  
  Linux exports HZ value to user space via AT_CLKTCK auxiliary vector
  entry since 2.4.0.
  Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK),
  glibc falls back to the hard-coded CLK_TCK value when aux entry
  is not present.
  
  Glibc versions prior to 2.2.1 always use hard-coded CLK_TCK value.
  
  For older applications/libc's which depends on hard-coded CLK_TCK
  value user should set compat.linux.osrelease less than 2.4.0.
  
  linux_times() shall use the value that is exported to user space.
  
  PR:		kern/134251
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/linux32/linux32_sysvec.c
  stable/7/sys/compat/linux/linux_mib.h
  stable/7/sys/compat/linux/linux_misc.c
  stable/7/sys/compat/linux/linux_misc.h
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/linux/linux_sysvec.c

Modified: stable/7/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_sysvec.c	Thu May 28 18:11:09 2009	(r192986)
+++ stable/7/sys/amd64/linux32/linux32_sysvec.c	Thu May 28 18:26:18 2009	(r192987)
@@ -263,7 +263,17 @@ elf_linux_fixup(register_t **stack_base,
 	pos = base + (imgp->args->argc + imgp->args->envc + 2);
 
 	AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature);
-	AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz);
+
+	/*
+	 * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0,
+	 * as it has appeared in the 2.4.0-rc7 first time.
+	 * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK),
+	 * glibc falls back to the hard-coded CLK_TCK value when aux entry
+	 * is not present.
+	 * Also see linux_times() implementation.
+	 */
+	if (linux_kernver(curthread) >= LINUX_KERNVER_2004000)
+		AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, stclohz);
 	AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr);
 	AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent);
 	AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum);
@@ -1120,6 +1130,7 @@ linux_elf_modevent(module_t mod, int typ
 			    linux_proc_exec, NULL, 1000);
 			linux_szplatform = roundup(strlen(linux_platform) + 1,
 			    sizeof(char *));
+			stclohz = (stathz ? stathz : hz);
 			if (bootverbose)
 				printf("Linux ELF exec handler installed\n");
 		} else

Modified: stable/7/sys/compat/linux/linux_mib.h
==============================================================================
--- stable/7/sys/compat/linux/linux_mib.h	Thu May 28 18:11:09 2009	(r192986)
+++ stable/7/sys/compat/linux/linux_mib.h	Thu May 28 18:26:18 2009	(r192987)
@@ -42,6 +42,7 @@ int	linux_set_oss_version(struct thread 
 
 int	linux_kernver(struct thread *td);
 
+#define	LINUX_KERNVER_2004000		2004000
 #define	LINUX_KERNVER_2006000		2006000
 
 #define	linux_use26(t)		(linux_kernver(t) >= LINUX_KERNVER_2006000)

Modified: stable/7/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/7/sys/compat/linux/linux_misc.c	Thu May 28 18:11:09 2009	(r192986)
+++ stable/7/sys/compat/linux/linux_misc.c	Thu May 28 18:26:18 2009	(r192987)
@@ -90,6 +90,8 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+int stclohz;				/* Statistics clock frequency */
+
 #define BSD_TO_LINUX_SIGNAL(sig)	\
 	(((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig)
 
@@ -661,9 +663,19 @@ struct l_times_argv {
 	l_clock_t	tms_cstime;
 };
 
-#define CLK_TCK 100			/* Linux uses 100 */
 
-#define CONVTCK(r)	(r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK))
+/*
+ * Glibc versions prior to 2.2.1 always use hard-coded CLK_TCK value.
+ * Since 2.2.1 Glibc uses value exported from kernel via AT_CLKTCK
+ * auxiliary vector entry.
+ */
+#define	CLK_TCK		100
+
+#define	CONVOTCK(r)	(r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK))
+#define	CONVNTCK(r)	(r.tv_sec * stclohz + r.tv_usec / (1000000 / stclohz))
+
+#define	CONVTCK(r)	(linux_kernver(td) >= LINUX_KERNVER_2004000 ?		\
+			    CONVNTCK(r) : CONVOTCK(r))
 
 int
 linux_times(struct thread *td, struct linux_times_args *args)

Modified: stable/7/sys/compat/linux/linux_misc.h
==============================================================================
--- stable/7/sys/compat/linux/linux_misc.h	Thu May 28 18:11:09 2009	(r192986)
+++ stable/7/sys/compat/linux/linux_misc.h	Thu May 28 18:26:18 2009	(r192987)
@@ -65,4 +65,6 @@ extern const char *linux_platform;
 #define	__LINUX_NPXCW__		0x37f
 #endif
 
+extern int stclohz;
+
 #endif	/* _LINUX_MISC_H_ */

Modified: stable/7/sys/i386/linux/linux_sysvec.c
==============================================================================
--- stable/7/sys/i386/linux/linux_sysvec.c	Thu May 28 18:11:09 2009	(r192986)
+++ stable/7/sys/i386/linux/linux_sysvec.c	Thu May 28 18:26:18 2009	(r192987)
@@ -257,7 +257,17 @@ elf_linux_fixup(register_t **stack_base,
 	pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2);
 
 	AUXARGS_ENTRY(pos, LINUX_AT_HWCAP, cpu_feature);
-	AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, hz);
+
+	/*
+	 * Do not export AT_CLKTCK when emulating Linux kernel prior to 2.4.0,
+	 * as it has appeared in the 2.4.0-rc7 first time.
+	 * Being exported, AT_CLKTCK is returned by sysconf(_SC_CLK_TCK),
+	 * glibc falls back to the hard-coded CLK_TCK value when aux entry
+	 * is not present.
+	 * Also see linux_times() implementation.
+	 */
+	if (linux_kernver(curthread) >= LINUX_KERNVER_2004000)
+		AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, stclohz);
 	AUXARGS_ENTRY(pos, AT_PHDR, args->phdr);
 	AUXARGS_ENTRY(pos, AT_PHENT, args->phent);
 	AUXARGS_ENTRY(pos, AT_PHNUM, args->phnum);
@@ -1091,6 +1101,7 @@ linux_elf_modevent(module_t mod, int typ
 			linux_get_machine(&linux_platform);
 			linux_szplatform = roundup(strlen(linux_platform) + 1,
 			    sizeof(char *));
+			stclohz = (stathz ? stathz : hz);
 			if (bootverbose)
 				printf("Linux ELF exec handler installed\n");
 		} else
From delphij at FreeBSD.org  Thu May 28 21:17:28 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Thu May 28 21:17:45 2009
Subject: svn commit: r192995 - stable/7/lib/libufs
Message-ID: <200905282117.n4SLHSi7050030@svn.freebsd.org>

Author: delphij
Date: Thu May 28 21:17:27 2009
New Revision: 192995
URL: http://svn.freebsd.org/changeset/base/192995

Log:
  Merge r190646:
  
  Bail out when memory allocation is failed, rather than referencing
  a NULL pointer.
  
  PR: kern/94480
  Submitted by: Michiel Pelt 

Modified:
  stable/7/lib/libufs/   (props changed)
  stable/7/lib/libufs/block.c

Modified: stable/7/lib/libufs/block.c
==============================================================================
--- stable/7/lib/libufs/block.c	Thu May 28 21:12:43 2009	(r192994)
+++ stable/7/lib/libufs/block.c	Thu May 28 21:17:27 2009	(r192995)
@@ -63,8 +63,10 @@ bread(struct uufsd *disk, ufs2_daddr_t b
 	 */
 	if (((intptr_t)data) & 0x3f) {
 		p2 = malloc(size);
-		if (p2 == NULL)
+		if (p2 == NULL) {
 			ERROR(disk, "allocate bounce buffer");
+			goto fail;
+		}
 	}
 	cnt = pread(disk->d_fd, p2, size, (off_t)(blockno * disk->d_bsize));
 	if (cnt == -1) {
@@ -114,8 +116,10 @@ bwrite(struct uufsd *disk, ufs2_daddr_t 
 	 */
 	if (((intptr_t)data) & 0x3f) {
 		p2 = malloc(size);
-		if (p2 == NULL)
+		if (p2 == NULL) {
 			ERROR(disk, "allocate bounce buffer");
+			return (-1);
+		}
 		memcpy(p2, data, size);
 		data = p2;
 	}
From delphij at FreeBSD.org  Thu May 28 21:52:05 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Thu May 28 21:52:16 2009
Subject: svn commit: r192999 - in stable/7/lib/libc: . gen string
Message-ID: <200905282152.n4SLq1ex050970@svn.freebsd.org>

Author: delphij
Date: Thu May 28 21:52:00 2009
New Revision: 192999
URL: http://svn.freebsd.org/changeset/base/192999

Log:
  Merge r192129+r190661:
  
  Properly handle malloc() failures.
  
  PR:	bin/83338

Modified:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/gen/getcap.c
  stable/7/lib/libc/string/ffsll.c   (props changed)
  stable/7/lib/libc/string/flsll.c   (props changed)

Modified: stable/7/lib/libc/gen/getcap.c
==============================================================================
--- stable/7/lib/libc/gen/getcap.c	Thu May 28 21:41:01 2009	(r192998)
+++ stable/7/lib/libc/gen/getcap.c	Thu May 28 21:52:00 2009	(r192999)
@@ -189,7 +189,7 @@ getent(char **cap, u_int *len, char **db
 {
 	DB *capdbp;
 	char *r_end, *rp, **db_p;
-	int myfd, eof, foundit, retval, clen;
+	int myfd, eof, foundit, retval;
 	char *record, *cbuf;
 	int tc_not_resolved;
 	char pbuf[_POSIX_PATH_MAX];
@@ -251,14 +251,16 @@ getent(char **cap, u_int *len, char **db
 					return (retval);
 				}
 				/* save the data; close frees it */
-				clen = strlen(record);
-				cbuf = malloc(clen + 1);
-				memcpy(cbuf, record, clen + 1);
+				cbuf = strdup(record);
 				if (capdbp->close(capdbp) < 0) {
 					free(cbuf);
 					return (-2);
 				}
-				*len = clen;
+				if (cbuf == NULL) {
+					errno = ENOMEM;
+					return (-2);
+				}
+				*len = strlen(cbuf);
 				*cap = cbuf;
 				return (retval);
 			} else {
From kmacy at FreeBSD.org  Thu May 28 23:05:18 2009
From: kmacy at FreeBSD.org (Kip Macy)
Date: Thu May 28 23:05:24 2009
Subject: svn commit: r193003 - stable/7/rescue/rescue
Message-ID: <200905282305.n4SN5HfR052677@svn.freebsd.org>

Author: kmacy
Date: Thu May 28 23:05:17 2009
New Revision: 193003
URL: http://svn.freebsd.org/changeset/base/193003

Log:
  MFC 192617
  add zfs and zpool to /rescue

Modified:
  stable/7/rescue/rescue/Makefile

Modified: stable/7/rescue/rescue/Makefile
==============================================================================
--- stable/7/rescue/rescue/Makefile	Thu May 28 22:12:14 2009	(r193002)
+++ stable/7/rescue/rescue/Makefile	Thu May 28 23:05:17 2009	(r193003)
@@ -71,7 +71,7 @@ CRUNCH_SRCDIRS+= bin
 CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv pax ps pwd 	\
 	 realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
 .if ${MK_OPENSSL} != "no"
 CRUNCH_LIBS+= -lcrypto
 .endif
@@ -129,6 +129,10 @@ CRUNCH_PROGS_sbin+= ping6
 .if ${MK_IPFILTER} != "no"
 CRUNCH_PROGS_sbin+= ipf
 .endif
+.if ${MK_ZFS} != "no"
+CRUNCH_PROGS_sbin+= zfs
+CRUNCH_PROGS_sbin+= zpool
+.endif
 
 # crunchgen does not like C++ programs; this should be fixed someday
 # CRUNCH_PROGS+= devd
@@ -137,6 +141,9 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ld
 .if ${MK_IPX} != "no"
 CRUNCH_LIBS+= -lipx
 .endif
+.if ${MK_ZFS} != "no"
+CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
+.endif
 CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz
 
 .if ${MACHINE_ARCH} == "i386"
@@ -173,6 +180,10 @@ CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../.
 CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid
 CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery
 CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf
+.if ${MK_ZFS} != "no"
+CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs
+CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool
+.endif
 CRUNCH_ALIAS_reboot= fastboot halt fasthalt
 CRUNCH_ALIAS_restore= rrestore
 CRUNCH_ALIAS_dump= rdump
@@ -210,6 +221,11 @@ CRUNCH_SRCDIRS+= usr.sbin
 
 CRUNCH_PROGS_usr.sbin+= chroot
 
+CRUNCH_PROGS_usr.sbin+= chown
+CRUNCH_ALIAS_chown= chgrp
+##################################################################
+CRUNCH_LIBS+= -lm
+
 ##################################################################
 #  The following is pretty nearly a generic crunchgen-handling makefile
 #
From delphij at FreeBSD.org  Fri May 29 06:55:16 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Fri May 29 06:55:37 2009
Subject: svn commit: r193019 - in stable/7/lib/libc: . gen string
Message-ID: <200905290655.n4T6tFmH062675@svn.freebsd.org>

Author: delphij
Date: Fri May 29 06:55:15 2009
New Revision: 193019
URL: http://svn.freebsd.org/changeset/base/193019

Log:
  MFC r178253 and r178256:
  
  Implement fdopendir(3) by splitting __opendir2() into two parts, the upper
  part deals with the usual __opendir2() calls, and the rest part with an
  interface translator to expose fdopendir(3) functionality.  Manual page was
  obtained from kib@'s work for *at(2) system calls.

Modified:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/gen/Makefile.inc
  stable/7/lib/libc/gen/Symbol.map
  stable/7/lib/libc/gen/directory.3
  stable/7/lib/libc/gen/opendir.c
  stable/7/lib/libc/string/ffsll.c   (props changed)
  stable/7/lib/libc/string/flsll.c   (props changed)

Modified: stable/7/lib/libc/gen/Makefile.inc
==============================================================================
--- stable/7/lib/libc/gen/Makefile.inc	Fri May 29 06:41:23 2009	(r193018)
+++ stable/7/lib/libc/gen/Makefile.inc	Fri May 29 06:55:15 2009	(r193019)
@@ -71,6 +71,7 @@ MLINKS+=arc4random.3 arc4random_addrando
 MLINKS+=ctermid.3 ctermid_r.3
 MLINKS+=devname.3 devname_r.3
 MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \
+	directory.3 fdopendir.3 \
 	directory.3 readdir.3 directory.3 readdir_r.3 directory.3 rewinddir.3 \
 	directory.3 seekdir.3 directory.3 telldir.3
 MLINKS+=dlopen.3 dlclose.3 dlopen.3 dlerror.3 dlopen.3 dlfunc.3 \

Modified: stable/7/lib/libc/gen/Symbol.map
==============================================================================
--- stable/7/lib/libc/gen/Symbol.map	Fri May 29 06:41:23 2009	(r193018)
+++ stable/7/lib/libc/gen/Symbol.map	Fri May 29 06:55:15 2009	(r193019)
@@ -336,6 +336,10 @@ FBSD_1.0 {
 	wordfree;
 };
 
+FBSD_1.1 {
+	fdopendir;
+};
+
 FBSDprivate_1.0 {
 	/* needed by thread libraries */
 	__thr_jtable;

Modified: stable/7/lib/libc/gen/directory.3
==============================================================================
--- stable/7/lib/libc/gen/directory.3	Fri May 29 06:41:23 2009	(r193018)
+++ stable/7/lib/libc/gen/directory.3	Fri May 29 06:55:15 2009	(r193019)
@@ -28,11 +28,12 @@
 .\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd April 16, 2008
 .Dt DIRECTORY 3
 .Os
 .Sh NAME
 .Nm opendir ,
+.Nm fdopendir ,
 .Nm readdir ,
 .Nm readdir_r ,
 .Nm telldir ,
@@ -48,6 +49,8 @@
 .In dirent.h
 .Ft DIR *
 .Fn opendir "const char *filename"
+.Ft DIR *
+.Fn fdopendir "int fd"
 .Ft struct dirent *
 .Fn readdir "DIR *dirp"
 .Ft int
@@ -84,6 +87,36 @@ cannot be accessed, or if it cannot
 enough memory to hold the whole thing.
 .Pp
 The
+.Fn fdopendir
+function is equivalent to the
+.Fn opendir
+function except that the directory is specified by a file descriptor
+.Fa fd
+rather than by a name.
+The file offset associated with the file descriptor at the time of the call
+determines which entries are returned.
+.Pp
+Upon successful return from
+.Fn fdopendir ,
+the file descriptor is under the control of the system,
+and if any attempt is made to close the file descriptor,
+or to modify the state of the associated description other than by means
+of
+.Fn closedir ,
+.Fn readdir ,
+.Fn readdir_r ,
+or
+.Fn rewinddir ,
+the behavior is undefined.
+Upon calling
+.Fn closedir
+the file descriptor is closed.
+The
+.Dv FD_CLOEXEC
+flag is set on the file descriptor by a successful call to
+.Fn fdopendir .
+.Pp
+The
 .Fn readdir
 function
 returns a pointer to the next directory entry.
@@ -202,3 +235,7 @@ and
 .Fn dirfd
 functions appeared in
 .Bx 4.2 .
+The
+.Fn fdopendir
+function appeared in
+.Fx 8.0 .

Modified: stable/7/lib/libc/gen/opendir.c
==============================================================================
--- stable/7/lib/libc/gen/opendir.c	Fri May 29 06:41:23 2009	(r193018)
+++ stable/7/lib/libc/gen/opendir.c	Fri May 29 06:55:15 2009	(r193019)
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -47,32 +47,38 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 
 #include "telldir.h"
+
+static DIR * __opendir_common(int, const char *, int);
+
 /*
  * Open a directory.
  */
 DIR *
-opendir(name)
-	const char *name;
+opendir(const char *name)
 {
 
 	return (__opendir2(name, DTF_HIDEW|DTF_NODUP));
 }
 
+/*
+ * Open a directory with existing file descriptor.
+ */
 DIR *
-__opendir2(name, flags)
-	const char *name;
-	int flags;
+fdopendir(int fd)
+{
+
+	return (__opendir_common(fd, NULL, DTF_HIDEW|DTF_NODUP));
+}
+
+DIR *
+__opendir2(const char *name, int flags)
 {
-	DIR *dirp;
 	int fd;
-	int incr;
-	int saved_errno;
-	int unionstack;
 	struct stat statb;
 
 	/*
 	 * stat() before _open() because opening of special files may be
-	 * harmful.  _fstat() after open because the file may have changed.
+	 * harmful.
 	 */
 	if (stat(name, &statb) != 0)
 		return (NULL);
@@ -82,7 +88,24 @@ __opendir2(name, flags)
 	}
 	if ((fd = _open(name, O_RDONLY | O_NONBLOCK)) == -1)
 		return (NULL);
+
+	return __opendir_common(fd, name, flags);
+}
+
+/*
+ * Common routine for opendir(3), __opendir2(3) and fdopendir(3).
+ */
+static DIR *
+__opendir_common(int fd, const char *name, int flags)
+{
+	DIR *dirp;
+	int incr;
+	int saved_errno;
+	int unionstack;
+	struct stat statb;
+
 	dirp = NULL;
+	/* _fstat() the open handler because the file may have changed.  */
 	if (_fstat(fd, &statb) != 0)
 		goto fail;
 	if (!S_ISDIR(statb.st_mode)) {
From delphij at FreeBSD.org  Fri May 29 06:57:46 2009
From: delphij at FreeBSD.org (Xin LI)
Date: Fri May 29 06:57:52 2009
Subject: svn commit: r193020 - stable/7/sys/sys
Message-ID: <200905290657.n4T6vjMt062765@svn.freebsd.org>

Author: delphij
Date: Fri May 29 06:57:45 2009
New Revision: 193020
URL: http://svn.freebsd.org/changeset/base/193020

Log:
  Bump __FreeBSDversion for fdopendir(3) MFC.

Modified:
  stable/7/sys/sys/param.h

Modified: stable/7/sys/sys/param.h
==============================================================================
--- stable/7/sys/sys/param.h	Fri May 29 06:55:15 2009	(r193019)
+++ stable/7/sys/sys/param.h	Fri May 29 06:57:45 2009	(r193020)
@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 702101	/* Master, propagated to newvers */
+#define __FreeBSD_version 702102	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include 
From avg at FreeBSD.org  Fri May 29 14:42:03 2009
From: avg at FreeBSD.org (Andriy Gapon)
Date: Fri May 29 14:42:14 2009
Subject: svn commit: r193040 - stable/7
Message-ID: <200905291442.n4TEg290077819@svn.freebsd.org>

Author: avg
Date: Fri May 29 14:42:02 2009
New Revision: 193040
URL: http://svn.freebsd.org/changeset/base/193040

Log:
  use new btxld when building world in older environment
  
  This is a direct commit to the branch.
  This is for the benefit of those who define LOADER_ZFS_SUPPORT but
  should't hurt anybody else.
  Build of zfsboot requires new feature of btxld that it obtained
  (via MFC) in r192697: "merge 177933. Allow for a zero length 'loader'"
  (btxld is a build tool and a cross-build tool)
  Please note that __FreeBSD_version was bumped some time after r192697
  for an unrelated change.
  
  Reviewed by:	des
  Approved by:	jhb (mentor)

Modified:
  stable/7/Makefile.inc1

Modified: stable/7/Makefile.inc1
==============================================================================
--- stable/7/Makefile.inc1	Fri May 29 14:25:51 2009	(r193039)
+++ stable/7/Makefile.inc1	Fri May 29 14:42:02 2009	(r193040)
@@ -985,7 +985,7 @@ build-tools:
 #
 # cross-tools: Build cross-building tools
 #
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 702102
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
From niclas.zeising at gmail.com  Fri May 29 17:26:03 2009
From: niclas.zeising at gmail.com (Niclas Zeising)
Date: Fri May 29 17:26:14 2009
Subject: svn commit: r193040 - stable/7
In-Reply-To: <4A2018BA.9040305@freebsd.org>
References: <200905291442.n4TEg290077819@svn.freebsd.org>
	<4A2016DC.80001@gmail.com> <4A2018BA.9040305@freebsd.org>
Message-ID: <4A201AA4.2080106@gmail.com>

Andriy Gapon wrote:
> on 29/05/2009 20:09 Niclas Zeising said the following:
>> Is it possible to get something along this line in 8-CURRENT as well? I
>> accidentally removed btxld once and when I was building world it stopped
>> in sys/boot because it was missing. I had to manually build and install
>> it before i could continue with my buildworld, which was a bit annoying.
> 
> Short answer: no, it was your fault :-)
> 
> Long answer: possibly - there are a number of tools that are always used
> from /usr/obj (so to speak), but some other tools are used that way only
> if there is a good reason to do so. But I think that we could always use
> those latter tools from /usr/obj, I don't see why we couldn't.

Obviously it was my fault, and had it bin cc or make I wouldn't have 
complained, but it's such a small utility, I didn't even know it existed 
or that it was needed... I was just asking, I apologize if I sounded a 
bit angry in the previous mail.
Regards!
//Niclas
-- 
From avg at freebsd.org  Fri May 29 17:29:42 2009
From: avg at freebsd.org (Andriy Gapon)
Date: Fri May 29 17:29:48 2009
Subject: svn commit: r193040 - stable/7
In-Reply-To: <4A2016DC.80001@gmail.com>
References: <200905291442.n4TEg290077819@svn.freebsd.org>
	<4A2016DC.80001@gmail.com>
Message-ID: <4A2018BA.9040305@freebsd.org>

on 29/05/2009 20:09 Niclas Zeising said the following:
> 
> Is it possible to get something along this line in 8-CURRENT as well? I
> accidentally removed btxld once and when I was building world it stopped
> in sys/boot because it was missing. I had to manually build and install
> it before i could continue with my buildworld, which was a bit annoying.

Short answer: no, it was your fault :-)

Long answer: possibly - there are a number of tools that are always used
from /usr/obj (so to speak), but some other tools are used that way only
if there is a good reason to do so. But I think that we could always use
those latter tools from /usr/obj, I don't see why we couldn't.
-- 
Andriy Gapon
From niclas.zeising at gmail.com  Fri May 29 17:35:45 2009
From: niclas.zeising at gmail.com (Niclas Zeising)
Date: Fri May 29 17:35:51 2009
Subject: svn commit: r193040 - stable/7
In-Reply-To: <200905291442.n4TEg290077819@svn.freebsd.org>
References: <200905291442.n4TEg290077819@svn.freebsd.org>
Message-ID: <4A2016DC.80001@gmail.com>

Andriy Gapon wrote:
> Author: avg
> Date: Fri May 29 14:42:02 2009
> New Revision: 193040
> URL: http://svn.freebsd.org/changeset/base/193040
> 
> Log:
>   use new btxld when building world in older environment
>   
>   This is a direct commit to the branch.
>   This is for the benefit of those who define LOADER_ZFS_SUPPORT but
>   should't hurt anybody else.
>   Build of zfsboot requires new feature of btxld that it obtained
>   (via MFC) in r192697: "merge 177933. Allow for a zero length 'loader'"
>   (btxld is a build tool and a cross-build tool)
>   Please note that __FreeBSD_version was bumped some time after r192697
>   for an unrelated change.
>   
>   Reviewed by:	des
>   Approved by:	jhb (mentor)
> 
> Modified:
>   stable/7/Makefile.inc1
> 
> Modified: stable/7/Makefile.inc1
> ==============================================================================
> --- stable/7/Makefile.inc1	Fri May 29 14:25:51 2009	(r193039)
> +++ stable/7/Makefile.inc1	Fri May 29 14:42:02 2009	(r193040)
> @@ -985,7 +985,7 @@ build-tools:
>  #
>  # cross-tools: Build cross-building tools
>  #
> -.if ${TARGET_ARCH} != ${MACHINE_ARCH}
> +.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 702102
>  .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
>  _btxld=		usr.sbin/btxld
>  .endif
> _______________________________________________
> svn-src-all@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
> 

Is it possible to get something along this line in 8-CURRENT as well? I 
accidentally removed btxld once and when I was building world it stopped 
in sys/boot because it was missing. I had to manually build and install 
it before i could continue with my buildworld, which was a bit annoying.

Regards!
Niclas
-- 
From avg at freebsd.org  Fri May 29 18:14:50 2009
From: avg at freebsd.org (Andriy Gapon)
Date: Fri May 29 18:15:07 2009
Subject: svn commit: r193040 - stable/7
In-Reply-To: <4A201AA4.2080106@gmail.com>
References: <200905291442.n4TEg290077819@svn.freebsd.org>
	<4A2016DC.80001@gmail.com> <4A2018BA.9040305@freebsd.org>
	<4A201AA4.2080106@gmail.com>
Message-ID: <4A202614.7060609@freebsd.org>

on 29/05/2009 20:25 Niclas Zeising said the following:
> Andriy Gapon wrote:
>> on 29/05/2009 20:09 Niclas Zeising said the following:
>>> Is it possible to get something along this line in 8-CURRENT as well? I
>>> accidentally removed btxld once and when I was building world it stopped
>>> in sys/boot because it was missing. I had to manually build and install
>>> it before i could continue with my buildworld, which was a bit annoying.
>>
>> Short answer: no, it was your fault :-)
>>
>> Long answer: possibly - there are a number of tools that are always used
>> from /usr/obj (so to speak), but some other tools are used that way only
>> if there is a good reason to do so. But I think that we could always use
>> those latter tools from /usr/obj, I don't see why we couldn't.
> 
> Obviously it was my fault, and had it bin cc or make I wouldn't have
> complained, but it's such a small utility, I didn't even know it existed
> or that it was needed... I was just asking, I apologize if I sounded a
> bit angry in the previous mail.

Oh, not at all. I started to wonder myself why such small tools couldn't
always (unconditionally) be build-tools. Would save some hassle in cases
like this. And I don't see any down-side. Anyone?

-- 
Andriy Gapon
From lulf at FreeBSD.org  Fri May 29 19:37:18 2009
From: lulf at FreeBSD.org (Ulf Lilleengen)
Date: Fri May 29 19:37:29 2009
Subject: svn commit: r193053 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb geom
Message-ID: <200905291937.n4TJbHek084515@svn.freebsd.org>

Author: lulf
Date: Fri May 29 19:37:17 2009
New Revision: 193053
URL: http://svn.freebsd.org/changeset/base/193053

Log:
  MFC r179097:
  - Assert that we don't send new provider event for a provider which has
    G_PF_WITHER flag set.
  - Fix typo in assertion condition (sorry, but I forgot who report that).
  
  MFC r179151:
  Force commit to note, that the typo in KASSERT() was:
  
  PR:             kern/116896
  Reported by:    VANHULLEBUS Yvan 

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/geom/geom_subr.c

Modified: stable/7/sys/geom/geom_subr.c
==============================================================================
--- stable/7/sys/geom/geom_subr.c	Fri May 29 19:27:52 2009	(r193052)
+++ stable/7/sys/geom/geom_subr.c	Fri May 29 19:37:17 2009	(r193053)
@@ -531,6 +531,8 @@ g_new_provider_event(void *arg, int flag
 		return;
 	pp = arg;
 	G_VALID_PROVIDER(pp);
+	KASSERT(!(pp->flags & G_PF_WITHER),
+	    ("g_new_provider_event but withered"));
 	LIST_FOREACH(mp, &g_classes, class) {
 		if (mp->taste == NULL)
 			continue;
@@ -620,7 +622,7 @@ g_destroy_provider(struct g_provider *pp
 	    ("g_destroy_provider but attached"));
 	KASSERT (pp->acr == 0, ("g_destroy_provider with acr"));
 	KASSERT (pp->acw == 0, ("g_destroy_provider with acw"));
-	KASSERT (pp->acw == 0, ("g_destroy_provider with ace"));
+	KASSERT (pp->ace == 0, ("g_destroy_provider with ace"));
 	g_cancel_event(pp);
 	LIST_REMOVE(pp, provider);
 	gp = pp->geom;
From emax at FreeBSD.org  Fri May 29 20:22:58 2009
From: emax at FreeBSD.org (Maksim Yevmenkin)
Date: Fri May 29 20:23:14 2009
Subject: svn commit: r193060 - stable/7/usr.sbin/bluetooth/btpand
Message-ID: <200905292022.n4TKMvuE085709@svn.freebsd.org>

Author: emax
Date: Fri May 29 20:22:56 2009
New Revision: 193060
URL: http://svn.freebsd.org/changeset/base/193060

Log:
  MFC r192308
  
  Teach btpand(8) to recognized Bluetooth device node names.
  
  Tested by:	Daniel O'Connor 

Modified:
  stable/7/usr.sbin/bluetooth/btpand/   (props changed)
  stable/7/usr.sbin/bluetooth/btpand/btpand.c

Modified: stable/7/usr.sbin/bluetooth/btpand/btpand.c
==============================================================================
--- stable/7/usr.sbin/bluetooth/btpand/btpand.c	Fri May 29 20:01:50 2009	(r193059)
+++ stable/7/usr.sbin/bluetooth/btpand/btpand.c	Fri May 29 20:22:56 2009	(r193060)
@@ -101,7 +101,7 @@ main(int argc, char *argv[])
 			break;
 
 		case 'd': /* local address */
-			if (!bt_aton(optarg, &local_bdaddr)) {
+			if (!bt_devaddr(optarg, &local_bdaddr)) {
 				struct hostent  *he;
 
 				if ((he = bt_gethostbyname(optarg)) == NULL)
From emax at FreeBSD.org  Fri May 29 20:25:04 2009
From: emax at FreeBSD.org (Maksim Yevmenkin)
Date: Fri May 29 20:25:15 2009
Subject: svn commit: r193061 - stable/7/lib/libbluetooth
Message-ID: <200905292025.n4TKP3f2085801@svn.freebsd.org>

Author: emax
Date: Fri May 29 20:25:03 2009
New Revision: 193061
URL: http://svn.freebsd.org/changeset/base/193061

Log:
  MFC r192113
  
  Avoid floating point arithmetic while calculating iquiry length.
  
  Submitted by:	Iain Hibbert < plunky -at- rya-online -dot- net >

Modified:
  stable/7/lib/libbluetooth/   (props changed)
  stable/7/lib/libbluetooth/hci.c

Modified: stable/7/lib/libbluetooth/hci.c
==============================================================================
--- stable/7/lib/libbluetooth/hci.c	Fri May 29 20:22:56 2009	(r193060)
+++ stable/7/lib/libbluetooth/hci.c	Fri May 29 20:25:03 2009	(r193061)
@@ -410,7 +410,6 @@ bt_devinquiry(char const *devname, time_
 	ng_hci_inquiry_response		*ir;
 	struct bt_devinquiry		*i;
 	int				s, n;
-	time_t				to;
 
 	if (ii == NULL) {
 		errno = EINVAL;
@@ -452,16 +451,20 @@ bt_devinquiry(char const *devname, time_
 	cp->lap[1] = 0x8b;
 	cp->lap[2] = 0x9e;
 
-	/* Calculate inquire length in 1.28 second units */
-	to = (time_t) ((double) length / 1.28);
-	if (to <= 0)
-		cp->inquiry_length = 4;		/* 5.12 seconds */
-	else if (to > 254)
-		cp->inquiry_length = 255;	/* 326.40 seconds */
-	else
-		cp->inquiry_length = to + 1;
+	/*
+	 * Calculate inquire length in 1.28 second units
+	 * v2.x specification says that 1.28 -> 61.44 seconds
+	 * range is acceptable
+	 */
+
+	if (length <= 0)
+		length = 5;
+	else if (length == 1)
+		length = 2;
+	else if (length > 62)
+		length = 62;
 
-	to = (time_t)((double) cp->inquiry_length * 1.28) + 1;
+	cp->inquiry_length = (uint8_t)((length * 100) / 128);
 
 	if (num_rsp <= 0 || num_rsp > 255)
 		num_rsp = 8;
@@ -484,7 +487,7 @@ bt_devinquiry(char const *devname, time_
 
 wait_for_more:
 
-	n = bt_devrecv(s, buf, sizeof(buf), to);
+	n = bt_devrecv(s, buf, sizeof(buf), length);
 	if (n < 0) {
 		free(i);
 		bt_devclose(s);
From edwin at FreeBSD.org  Sat May 30 05:19:11 2009
From: edwin at FreeBSD.org (Edwin Groothuis)
Date: Sat May 30 05:19:18 2009
Subject: svn commit: r193081 - stable/7/share/misc
Message-ID: <200905300519.n4U5JA9P097346@svn.freebsd.org>

Author: edwin
Date: Sat May 30 05:19:10 2009
New Revision: 193081
URL: http://svn.freebsd.org/changeset/base/193081

Log:
  MFC of 192627 and 192626
  
  Updated against http://www.loc.gov/standards/iso639-2/langhome.html
  Snapshot was taken on 16 September 2008.
  
  Update share/misc/iso639
  Snapshot was taken on 23 May 2009.

Modified:
  stable/7/share/misc/iso639   (contents, props changed)

Modified: stable/7/share/misc/iso639
==============================================================================
--- stable/7/share/misc/iso639	Sat May 30 04:46:24 2009	(r193080)
+++ stable/7/share/misc/iso639	Sat May 30 05:19:10 2009	(r193081)
@@ -27,6 +27,12 @@
 #
 #   For general discussion about ISO language codes, write to: iso639@dkuug.dk
 
+#
+# Download the file http://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt
+# and run head/tools/tools/iso/check-iso639.pl to see if everything is up
+# to date.
+#
+
 # a2:   ISO 639-1 Alpha-2 code
 # bib:  ISO 639-2/B bibliographic code
 # term: ISO 639-2/B terminology code
@@ -37,69 +43,75 @@ ab	abk	abk	Abkhazian
 	ace	ace	Achinese
 	ach	ach	Acoli
 	ada	ada	Adangme
-	afa	afa	Afro-Asiatic (Other)
+	ady	ady	Adyghe; Adygei
+	afa	afa	Afro-Asiatic languages
 	afh	afh	Afrihili
 af	afr	afr	Afrikaans
-	aka	aka	Akan
+	ain	ain	Ainu
+ak	aka	aka	Akan
 	akk	akk	Akkadian
 sq	alb	sqi	Albanian
 	ale	ale	Aleut
 	alg	alg	Algonquian languages
+	alt	alt	Southern Altai
 am	amh	amh	Amharic
 	ang	ang	English, Old (ca.450-1100)
+	anp	anp	Angika
 	apa	apa	Apache languages
 ar	ara	ara	Arabic
-	arc	arc	Aramaic
+	arc	arc	Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)
+an	arg	arg	Aragonese
 hy	arm	hye	Armenian
-	arn	arn	Araucanian
+	arn	arn	Mapudungun; Mapuche
 	arp	arp	Arapaho
-	art	art	Artificial (Other)
+	art	art	Artificial languages
 	arw	arw	Arawak
 as	asm	asm	Assamese
-	ast	ast	Asturian; Bable
+	ast	ast	Asturian; Bable; Leonese; Asturleonese
 	ath	ath	Athapascan languages
 	aus	aus	Australian languages
-	ava	ava	Avaric
+av	ava	ava	Avaric
 ae	ave	ave	Avestan
 	awa	awa	Awadhi
 ay	aym	aym	Aymara
 az	aze	aze	Azerbaijani
-	bad	bad	Banda
+	bad	bad	Banda languages
 	bai	bai	Bamileke languages
 ba	bak	bak	Bashkir
 	bal	bal	Baluchi
-	bam	bam	Bambara
+bm	bam	bam	Bambara
 	ban	ban	Balinese
 eu	baq	eus	Basque
 	bas	bas	Basa
-	bat	bat	Baltic (Other)
-	bej	bej	Beja
+	bat	bat	Baltic languages
+	bej	bej	Beja; Bedawiyet
 be	bel	bel	Belarusian
 	bem	bem	Bemba
 bn	ben	ben	Bengali
-	ber	ber	Berber (Other)
+	ber	ber	Berber languages
 	bho	bho	Bhojpuri
 bh	bih	bih	Bihari
 	bik	bik	Bikol
-	bin	bin	Bini
+	bin	bin	Bini; Edo
 bi	bis	bis	Bislama
 	bla	bla	Siksika
 	bnt	bnt	Bantu (Other)
 bs	bos	bos	Bosnian
 	bra	bra	Braj
 br	bre	bre	Breton
-	btk	btk	Batak (Indonesia)
+	btk	btk	Batak languages
 	bua	bua	Buriat
 	bug	bug	Buginese
 bg	bul	bul	Bulgarian
 my	bur	mya	Burmese
+	byn	byn	Blin; Bilin
 	cad	cad	Caddo
-	cai	cai	Central American Indian (Other)
-	car	car	Carib
-ca	cat	cat	Catalan
-	cau	cau	Caucasian (Other)
+	cai	cai	Central American Indian languages
+	car	car	Galibi Carib
+ca	cat	cat	Catalan; Valencian
+	cau	cau	Caucasian languages
 	ceb	ceb	Cebuano
-	cel	cel	Celtic (Other)
+	cel	cel	Celtic languages
 ch	cha	cha	Chamorro
 	chb	chb	Chibcha
 ce	che	che	Chechen
@@ -109,35 +121,39 @@ zh	chi	zho	Chinese
 	chm	chm	Mari
 	chn	chn	Chinook jargon
 	cho	cho	Choctaw
-	chp	chp	Chipewyan
+	chp	chp	Chipewyan; Dene Suline
 	chr	chr	Cherokee
-cu	chu	chu	Church Slavic
+cu	chu	chu	Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic
 cv	chv	chv	Chuvash
 	chy	chy	Cheyenne
 	cmc	cmc	Chamic languages
 	cop	cop	Coptic
 kw	cor	cor	Cornish
 co	cos	cos	Corsican
-	cpe	cpe	Creoles and pidgins, English based (Other)
-	cpf	cpf	Creoles and pidgins, French-based (Other)
-	cpp	cpp	Creoles and pidgins, Portuguese-based (Other)
-	cre	cre	Cree
-	crp	crp	Creoles and pidgins (Other)
-	cus	cus	Cushitic (Other)
+	cpe	cpe	Creoles and pidgins, English based
+	cpf	cpf	Creoles and pidgins, French-based
+	cpp	cpp	Creoles and pidgins, Portuguese-based
+cr	cre	cre	Cree
+	crh	crh	Crimean Tatar; Crimean Turkish
+	crp	crp	Creoles and pidgins
+	csb	csb	Kashubian
+	cus	cus	Cushitic languages
 cs	cze	ces	Czech
 	dak	dak	Dakota
 da	dan	dan	Danish
-	day	day	Dayak
+	dar	dar	Dargwa
+	day	day	Land Dayak languages
 	del	del	Delaware
 	den	den	Slave (Athapascan)
 	dgr	dgr	Dogrib
 	din	din	Dinka
-	div	div	Divehi
+dv	div	div	Divehi; Dhivehi; Maldivian
 	doi	doi	Dogri
-	dra	dra	Dravidian (Other)
+	dra	dra	Dravidian languages
+	dsb	dsb	Lower Sorbian
 	dua	dua	Duala
 	dum	dum	Dutch, Middle (ca.1050-1350)
-nl	dut	nld	Dutch
+nl	dut	nld	Dutch; Flemish
 	dyu	dyu	Dyula
 dz	dzo	dzo	Dzongkha
 	efi	efi	Efik
@@ -148,32 +164,35 @@ en	eng	eng	English
 	enm	enm	English, Middle (1100-1500)
 eo	epo	epo	Esperanto
 et	est	est	Estonian
-	ewe	ewe	Ewe
+ee	ewe	ewe	Ewe
 	ewo	ewo	Ewondo
 	fan	fan	Fang
 fo	fao	fao	Faroese
 	fat	fat	Fanti
 fj	fij	fij	Fijian
+	fil	fil	Filipino; Pilipino
 fi	fin	fin	Finnish
-	fiu	fiu	Finno-Ugrian (Other)
+	fiu	fiu	Finno-Ugrian languages
 	fon	fon	Fon
 fr	fre	fra	French
 	frm	frm	French, Middle (ca.1400-1600)
 	fro	fro	French, Old (842-ca.1400)
-fy	fry	fry	Frisian
-	ful	ful	Fulah
+	frr	frr	Northern Frisian
+	frs	frs	Eastern Frisian
+fy	fry	fry	Western Frisian
+ff	ful	ful	Fulah
 	fur	fur	Friulian
 	gaa	gaa	Ga
 	gay	gay	Gayo
 	gba	gba	Gbaya
-	gem	gem	Germanic (Other)
+	gem	gem	Germanic languages
 ka	geo	kat	Georgian
 de	ger	deu	German
 	gez	gez	Geez
 	gil	gil	Gilbertese
-gd	gla	gla	Gaelic (Scots)
+gd	gla	gla	Gaelic; Scottish Gaelic
 ga	gle	gle	Irish
-gl	glg	glg	Gallegan
+gl	glg	glg	Galician
 gv	glv	glv	Manx
 	gmh	gmh	German, Middle High (ca.1050-1500)
 	goh	goh	German, Old High (ca.750-1050)
@@ -184,9 +203,11 @@ gv	glv	glv	Manx
 	grc	grc	Greek, Ancient (to 1453)
 el	gre	ell	Greek, Modern (1453-)
 gn	grn	grn	Guarani
+	gsw	gsw	Swiss German; Alemannic; Alsatian
 gu	guj	guj	Gujarati
-	gwi	gwi	Gwich�in
+	gwi	gwi	Gwich'in
 	hai	hai	Haida
+ht	hat	hat	Haitian; Haitian Creole
 ha	hau	hau	Hausa
 	haw	haw	Hawaiian
 he	heb	heb	Hebrew
@@ -197,55 +218,64 @@ hi	hin	hin	Hindi
 	hit	hit	Hittite
 	hmn	hmn	Hmong
 ho	hmo	hmo	Hiri Motu
+hr	hrv	hrv	Croatian
+	hsb	hsb	Upper Sorbian
 hu	hun	hun	Hungarian
 	hup	hup	Hupa
 	iba	iba	Iban
-	ibo	ibo	Igbo
+ig	ibo	ibo	Igbo
 is	ice	isl	Icelandic
-	ijo	ijo	Ijo
+io	ido	ido	Ido
+ii	iii	iii	Sichuan Yi; Nuosu
+	ijo	ijo	Ijo languages
 iu	iku	iku	Inuktitut
-ie	ile	ile	Interlingue
+ie	ile	ile	Interlingue; Occidental
 	ilo	ilo	Iloko
-ia	ina	ina	Interlingua (International Auxiliary Language      Association)
-	inc	inc	Indic (Other)
+ia	ina	ina	Interlingua (International Auxiliary Language Association)
+	inc	inc	Indic languages
 id	ind	ind	Indonesian
-	ine	ine	Indo-European (Other)
+	ine	ine	Indo-European languages
+	inh	inh	Ingush
 ik	ipk	ipk	Inupiaq
-	ira	ira	Iranian (Other)
+	ira	ira	Iranian languages
 	iro	iro	Iroquoian languages
 it	ita	ita	Italian
 jv	jav	jav	Javanese
+	jbo	jbo	Lojban
 ja	jpn	jpn	Japanese
 	jpr	jpr	Judeo-Persian
 	jrb	jrb	Judeo-Arabic
 	kaa	kaa	Kara-Kalpak
 	kab	kab	Kabyle
-	kac	kac	Kachin
-kl	kal	kal	Kalaallisut
+	kac	kac	Kachin; Jingpho
+kl	kal	kal	Kalaallisut; Greenlandic
 	kam	kam	Kamba
 kn	kan	kan	Kannada
-	kar	kar	Karen
+	kar	kar	Karen languages
 ks	kas	kas	Kashmiri
-	kau	kau	Kanuri
+kr	kau	kau	Kanuri
 	kaw	kaw	Kawi
 kk	kaz	kaz	Kazakh
+	kbd	kbd	Kabardian
 	kha	kha	Khasi
-	khi	khi	Khoisan (Other)
-km	khm	khm	Khmer
-	kho	kho	Khotanese
-ki	kik	kik	Kikuyu
+	khi	khi	Khoisan languages
+km	khm	khm	Central Khmer
+	kho	kho	Khotanese; Sakan
+ki	kik	kik	Kikuyu; Gikuyu
 rw	kin	kin	Kinyarwanda
-ky	kir	kir	Kirghiz
+ky	kir	kir	Kirghiz; Kyrgyz
 	kmb	kmb	Kimbundu
 	kok	kok	Konkani
 kv	kom	kom	Komi
-	kon	kon	Kongo
+kg	kon	kon	Kongo
 ko	kor	kor	Korean
 	kos	kos	Kosraean
 	kpe	kpe	Kpelle
-	kro	kro	Kru
+	krc	krc	Karachay-Balkar
+	krl	krl	Karelian
+	kro	kro	Kru languages
 	kru	kru	Kurukh
-kj	kua	kua	Kuanyama
+kj	kua	kua	Kuanyama; Kwanyama
 	kum	kum	Kumyk
 ku	kur	kur	Kurdish
 	kut	kut	Kutenai
@@ -256,112 +286,120 @@ lo	lao	lao	Lao
 la	lat	lat	Latin
 lv	lav	lav	Latvian
 	lez	lez	Lezghian
+li	lim	lim	Limburgan; Limburger; Limburgish
 ln	lin	lin	Lingala
 lt	lit	lit	Lithuanian
 	lol	lol	Mongo
 	loz	loz	Lozi
-lb	ltz	ltz	Letzeburgesch
+lb	ltz	ltz	Luxembourgish; Letzeburgesch
 	lua	lua	Luba-Lulua
-	lub	lub	Luba-Katanga
-	lug	lug	Ganda
+lu	lub	lub	Luba-Katanga
+lg	lug	lug	Ganda
 	lui	lui	Luiseno
 	lun	lun	Lunda
 	luo	luo	Luo (Kenya and Tanzania)
-	lus	lus	lushai
+	lus	lus	Lushai
 mk	mac	mkd	Macedonian
 	mad	mad	Madurese
 	mag	mag	Magahi
-mh	mah	mah	Marshall
+mh	mah	mah	Marshallese
 	mai	mai	Maithili
 	mak	mak	Makasar
 ml	mal	mal	Malayalam
 	man	man	Mandingo
 mi	mao	mri	Maori
-	map	map	Austronesian (Other)
+	map	map	Austronesian languages
 mr	mar	mar	Marathi
 	mas	mas	Masai
 ms	may	msa	Malay
+	mdf	mdf	Moksha
 	mdr	mdr	Mandar
 	men	men	Mende
 	mga	mga	Irish, Middle (900-1200)
-	mic	mic	Micmac
+	mic	mic	Mi'kmaq; Micmac
 	min	min	Minangkabau
-	mis	mis	Miscellaneous languages
-	mkh	mkh	Mon-Khmer (Other)
+	mis	mis	Uncoded languages
+	mkh	mkh	Mon-Khmer languages
 mg	mlg	mlg	Malagasy
 mt	mlt	mlt	Maltese
 	mnc	mnc	Manchu
 	mni	mni	Manipuri
 	mno	mno	Manobo languages
 	moh	moh	Mohawk
-mo	mol	mol	Moldavian
 mn	mon	mon	Mongolian
 	mos	mos	Mossi
 	mul	mul	Multiple languages
 	mun	mun	Munda languages
 	mus	mus	Creek
+	mwl	mwl	Mirandese
 	mwr	mwr	Marwari
 	myn	myn	Mayan languages
-	nah	nah	Nahuatl
-	nai	nai	North American Indian
+	myv	myv	Erzya
+	nah	nah	Nahuatl languages
+	nai	nai	North American Indian languages
+	nap	nap	Neapolitan
 na	nau	nau	Nauru
-nv	nav	nav	Navajo
-nr	nbl	nbl	Ndebele, South
-nd	nde	nde	Ndebele, North
+nv	nav	nav	Navajo; Navaho
+nr	nbl	nbl	Ndebele, South; South Ndebele
+nd	nde	nde	Ndebele, North; North Ndebele
 ng	ndo	ndo	Ndonga
 	nds	nds	Low German; Low Saxon; German, Low; Saxon, Low
 ne	nep	nep	Nepali
-	new	new	Newari
+	new	new	Nepal Bhasa; Newari
 	nia	nia	Nias
-	nic	nic	Niger-Kordofanian (Other)
+	nic	nic	Niger-Kordofanian languages
 	niu	niu	Niuean
+	nog	nog	Nogai
 	non	non	Norse, Old
 no	nor	nor	Norwegian
-nn	nno	nno	Norwegian Nynorsk
-nb	nob	nob	Norwegian Bokm�l
-	nso	nso	Sotho, Northern
+nn	nno	nno	Norwegian Nynorsk; Nynorsk, Norwegian
+nb	nob	nob	Bokmål, Norwegian; Norwegian Bokmål
+	nqo	nqo	N'Ko
+	nso	nso	Pedi; Sepedi; Northern Sotho
 	nub	nub	Nubian languages
-ny	nya	nya	 Chichewa; Nyanja
+	nwc	nwc	Classical Newari; Old Newari; Classical Nepal Bhasa
+ny	nya	nya	Chichewa; Chewa; Nyanja
 	nym	nym	Nyamwezi
 	nyn	nyn	Nyankole
 	nyo	nyo	Nyoro
 	nzi	nzi	Nzima
-oc	oci	oci	Occitan (post 1500); Proven�al
-	oji	oji	Ojibwa
+oc	oci	oci	Occitan (post 1500); Provençal
+oj	oji	oji	Ojibwa
 or	ori	ori	Oriya
 om	orm	orm	Oromo
 	osa	osa	Osage
 os	oss	oss	Ossetian; Ossetic
 	ota	ota	Turkish, Ottoman (1500-1928)
 	oto	oto	Otomian languages
-	paa	paa	Papuan (Other)
+	paa	paa	Papuan languages
 	pag	pag	Pangasinan
 	pal	pal	Pahlavi
-	pam	pam	Pampanga
-pa	pan	pan	Panjabi
+	pam	pam	Pampanga; Kapampangan
+pa	pan	pan	Panjabi; Punjabi
 	pap	pap	Papiamento
 	pau	pau	Palauan
 	peo	peo	Persian, Old (ca.600-400 B.C.)
 fa	per	fas	Persian
-	phi	phi	Philippine (Other)
+	phi	phi	Philippine languages
 	phn	phn	Phoenician
 pi	pli	pli	Pali
 pl	pol	pol	Polish
 	pon	pon	Pohnpeian
 pt	por	por	Portuguese
 	pra	pra	Prakrit languages
-	pro	pro	Proven�al, Old (to 1500)
-ps	pus	pus	Pushto
+	pro	pro	Provençal, Old (to 1500)
+ps	pus	pus	Pushto; Pashto
 	qaa-qtz	qaa-qtz	Reserved for local use
 qu	que	que	Quechua
 	raj	raj	Rajasthani
 	rap	rap	Rapanui
-	rar	rar	Rarotongan
-	roa	roa	Romance (Other)
-rm	roh	roh	Raeto-Romance
+	rar	rar	Rarotongan; Cook Islands Maori
+	roa	roa	Romance languages
+rm	roh	roh	Romansh
 	rom	rom	Romany
-ro	rum	ron	Romanian
+ro	rum	ron	Romanian; Moldavian; Moldovan
 rn	run	run	Rundi
+	rup	rup	Aromanian; Arumanian; Macedo-Romanian
 ru	rus	rus	Russian
 	sad	sad	Sandawe
 sg	sag	sag	Sango
@@ -372,35 +410,40 @@ sg	sag	sag	Sango
 sa	san	san	Sanskrit
 	sas	sas	Sasak
 	sat	sat	Santali
-sr	scc	srp	Serbian
+	scn	scn	Sicilian
 	sco	sco	Scots
-hr	scr	hrv	Croatian
 	sel	sel	Selkup
-	sem	sem	Semitic (Other)
+	sem	sem	Semitic languages
 	sga	sga	Irish, Old (to 900)
 	sgn	sgn	Sign Languages
 	shn	shn	Shan
 	sid	sid	Sidamo
-si	sin	sin	Sinhalese
+si	sin	sin	Sinhala; Sinhalese
 	sio	sio	Siouan languages
-	sit	sit	Sino-Tibetan (Other)
-	sla	sla	Slavic (Other)
+	sit	sit	Sino-Tibetan languages
+	sla	sla	Slavic languages
 sk	slo	slk	Slovak
 sl	slv	slv	Slovenian
+	sma	sma	Southern Sami
 se	sme	sme	Northern Sami
-	smi	smi	Sami languages (Other)
+	smi	smi	Sami languages
+	smj	smj	Lule Sami
+	smn	smn	Inari Sami
 sm	smo	smo	Samoan
+	sms	sms	Skolt Sami
 sn	sna	sna	Shona
 sd	snd	snd	Sindhi
 	snk	snk	Soninke
 	sog	sog	Sogdian
 so	som	som	Somali
-	son	son	Songhai
-st	sot	sot	Sotho, Southern 
-es	spa	spa	Spanish
+	son	son	Songhai languages
+st	sot	sot	Sotho, Southern
+es	spa	spa	Spanish; Castilian
 sc	srd	srd	Sardinian
+	srn	srn	Sranan Tongo
+sr	srp	srp	Serbian
 	srr	srr	Serer
-	ssa	ssa	Nilo-Saharan (Other)
+	ssa	ssa	Nilo-Saharan languages
 ss	ssw	ssw	Swati
 	suk	suk	Sukuma
 su	sun	sun	Sundanese
@@ -408,9 +451,10 @@ su	sun	sun	Sundanese
 	sux	sux	Sumerian
 sw	swa	swa	Swahili
 sv	swe	swe	Swedish
+	syc	syc	Classical Syriac
 	syr	syr	Syriac
 ty	tah	tah	Tahitian
-	tai	tai	Tai (Other)
+	tai	tai	Tai languages
 ta	tam	tam	Tamil
 tt	tat	tat	Tatar
 te	tel	tel	Telugu
@@ -426,6 +470,7 @@ ti	tir	tir	Tigrinya
 	tiv	tiv	Tiv
 	tkl	tkl	Tokelau
 	tli	tli	Tlingit
+	tlh	tlh	Klingon; tlhIngan-Hol
 	tmh	tmh	Tamashek
 	tog	tog	Tonga (Nyasa)
 to	ton	ton	Tonga (Tonga Islands)
@@ -435,22 +480,24 @@ tn	tsn	tsn	Tswana
 ts	tso	tso	Tsonga
 tk	tuk	tuk	Turkmen
 	tum	tum	Tumbuka
+	tup	tup	Tupi languages
 tr	tur	tur	Turkish
-	tut	tut	Altaic (Other)
+	tut	tut	Altaic languages
 	tvl	tvl	Tuvalu
 tw	twi	twi	Twi
 	tyv	tyv	Tuvinian
+	udm	udm	Udmurt
 	uga	uga	Ugaritic
-ug	uig	uig	Uighur
+ug	uig	uig	Uighur; Uyghur
 uk	ukr	ukr	Ukrainian
 	umb	umb	Umbundu
 	und	und	Undetermined
 ur	urd	urd	Urdu
 uz	uzb	uzb	Uzbek
 	vai	vai	Vai
-	ven	ven	Venda
+ve	ven	ven	Venda
 vi	vie	vie	Vietnamese
-vo	vol	vol	Volap�k
+vo	vol	vol	Volapük
 	vot	vot	Votic
 	wak	wak	Wakashan languages
 	wal	wal	Walamo
@@ -458,7 +505,9 @@ vo	vol	vol	Volap�k
 	was	was	Washo
 cy	wel	cym	Welsh
 	wen	wen	Sorbian languages
+wa	wln	wln	Walloon
 wo	wol	wol	Wolof
+	xal	xal	Kalmyk; Oirat
 xh	xho	xho	Xhosa
 	yao	yao	Yao
 	yap	yap	Yapese
@@ -466,8 +515,11 @@ yi	yid	yid	Yiddish
 yo	yor	yor	Yoruba
 	ypk	ypk	Yupik languages
 	zap	zap	Zapotec
+	zbl	zbl	Blissymbols; Blissymbolics; Bliss
 	zen	zen	Zenaga
-za	zha	zha	Zhuang
-	znd	znd	Zande
+za	zha	zha	Zhuang; Chuang
+	znd	znd	Zande languages
 zu	zul	zul	Zulu
 	zun	zun	Zuni
+	zxx	zxx	No linguistic content; Not applicable
+	zza	zza	Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki
From attilio at FreeBSD.org  Sat May 30 23:27:52 2009
From: attilio at FreeBSD.org (Attilio Rao)
Date: Sat May 30 23:28:11 2009
Subject: svn commit: r193134 - in stable/7: lib/libc/i386/stdlib
	lib/libc/i386/string lib/libc_r/arch/amd64
	lib/libc_r/arch/i386 lib/libstand/i386 lib/msun/amd64
	lib/msun/i387 lib/msun/ia64 tools/KSE/ksetes...
Message-ID: <200905302327.n4UNRmxV022733@svn.freebsd.org>

Author: attilio
Date: Sat May 30 23:27:48 2009
New Revision: 193134
URL: http://svn.freebsd.org/changeset/base/193134

Log:
  MFC r192760:
  Use the END() macro appropriately in order to improve debugging for
  tools (Valgrind mainly).

Modified:
  stable/7/lib/libc/i386/stdlib/ldiv.S
  stable/7/lib/libc/i386/string/wcscmp.S
  stable/7/lib/libc_r/arch/amd64/_atomic_lock.S
  stable/7/lib/libc_r/arch/i386/_atomic_lock.S
  stable/7/lib/libstand/i386/_setjmp.S
  stable/7/lib/msun/amd64/e_sqrt.S
  stable/7/lib/msun/amd64/e_sqrtf.S
  stable/7/lib/msun/amd64/s_lrint.S
  stable/7/lib/msun/amd64/s_lrintf.S
  stable/7/lib/msun/amd64/s_remquo.S
  stable/7/lib/msun/amd64/s_remquof.S
  stable/7/lib/msun/amd64/s_scalbn.S
  stable/7/lib/msun/amd64/s_scalbnf.S
  stable/7/lib/msun/amd64/s_scalbnl.S
  stable/7/lib/msun/i387/e_exp.S
  stable/7/lib/msun/i387/e_fmod.S
  stable/7/lib/msun/i387/e_log.S
  stable/7/lib/msun/i387/e_log10.S
  stable/7/lib/msun/i387/e_log10f.S
  stable/7/lib/msun/i387/e_remainder.S
  stable/7/lib/msun/i387/e_remainderf.S
  stable/7/lib/msun/i387/e_sqrt.S
  stable/7/lib/msun/i387/e_sqrtf.S
  stable/7/lib/msun/i387/s_ceil.S
  stable/7/lib/msun/i387/s_ceilf.S
  stable/7/lib/msun/i387/s_ceill.S
  stable/7/lib/msun/i387/s_copysign.S
  stable/7/lib/msun/i387/s_copysignf.S
  stable/7/lib/msun/i387/s_copysignl.S
  stable/7/lib/msun/i387/s_cos.S
  stable/7/lib/msun/i387/s_finite.S
  stable/7/lib/msun/i387/s_floor.S
  stable/7/lib/msun/i387/s_floorf.S
  stable/7/lib/msun/i387/s_floorl.S
  stable/7/lib/msun/i387/s_llrint.S
  stable/7/lib/msun/i387/s_llrintf.S
  stable/7/lib/msun/i387/s_logb.S
  stable/7/lib/msun/i387/s_logbf.S
  stable/7/lib/msun/i387/s_lrint.S
  stable/7/lib/msun/i387/s_lrintf.S
  stable/7/lib/msun/i387/s_remquo.S
  stable/7/lib/msun/i387/s_remquof.S
  stable/7/lib/msun/i387/s_rint.S
  stable/7/lib/msun/i387/s_rintf.S
  stable/7/lib/msun/i387/s_scalbn.S
  stable/7/lib/msun/i387/s_scalbnf.S
  stable/7/lib/msun/i387/s_scalbnl.S
  stable/7/lib/msun/i387/s_significand.S
  stable/7/lib/msun/i387/s_significandf.S
  stable/7/lib/msun/i387/s_sin.S
  stable/7/lib/msun/i387/s_tan.S
  stable/7/lib/msun/i387/s_trunc.S
  stable/7/lib/msun/i387/s_truncf.S
  stable/7/lib/msun/i387/s_truncl.S
  stable/7/lib/msun/ia64/s_fma.S
  stable/7/lib/msun/ia64/s_fmaf.S
  stable/7/lib/msun/ia64/s_fmal.S
  stable/7/tools/KSE/ksetest/kse_asm.S
  stable/7/tools/KSE/rr/kse_asm.S

Modified: stable/7/lib/libc/i386/stdlib/ldiv.S
==============================================================================
--- stable/7/lib/libc/i386/stdlib/ldiv.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/libc/i386/stdlib/ldiv.S	Sat May 30 23:27:48 2009	(r193134)
@@ -40,3 +40,4 @@ ENTRY(ldiv)
         movl    %edx,8(%esp)
         ret
 END(ldiv)
+END(ldiv)

Modified: stable/7/lib/libc/i386/string/wcscmp.S
==============================================================================
--- stable/7/lib/libc/i386/string/wcscmp.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/libc/i386/string/wcscmp.S	Sat May 30 23:27:48 2009	(r193134)
@@ -78,3 +78,4 @@ no0:	subl	(%esi),%eax
 	popl	%edi
 	ret
 END(wcscmp)
+END(wcscmp)

Modified: stable/7/lib/libc_r/arch/amd64/_atomic_lock.S
==============================================================================
--- stable/7/lib/libc_r/arch/amd64/_atomic_lock.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/libc_r/arch/amd64/_atomic_lock.S	Sat May 30 23:27:48 2009	(r193134)
@@ -38,4 +38,5 @@ ENTRY(_atomic_lock)
 	movl	$1, %eax
 	xchgq	%rax, (%rdi)
 	ret
+END(_atomic_lock)
 

Modified: stable/7/lib/libc_r/arch/i386/_atomic_lock.S
==============================================================================
--- stable/7/lib/libc_r/arch/i386/_atomic_lock.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/libc_r/arch/i386/_atomic_lock.S	Sat May 30 23:27:48 2009	(r193134)
@@ -39,4 +39,5 @@ ENTRY(_atomic_lock)
 	movl	$1, %eax
 	xchg	%eax, (%ecx)
 	ret
+END(_atomic_lock)
 

Modified: stable/7/lib/libstand/i386/_setjmp.S
==============================================================================
--- stable/7/lib/libstand/i386/_setjmp.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/libstand/i386/_setjmp.S	Sat May 30 23:27:48 2009	(r193134)
@@ -58,6 +58,7 @@ ENTRY(_setjmp)
 	movl	%edi,20(%eax)
 	xorl	%eax,%eax
 	ret
+END(_setjmp)
 
 ENTRY(_longjmp)
 	movl	4(%esp),%edx
@@ -73,3 +74,4 @@ ENTRY(_longjmp)
 	incl	%eax
 1:	movl	%ecx,0(%esp)
 	ret
+END(_longjmp)

Modified: stable/7/lib/msun/amd64/e_sqrt.S
==============================================================================
--- stable/7/lib/msun/amd64/e_sqrt.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/e_sqrt.S	Sat May 30 23:27:48 2009	(r193134)
@@ -30,4 +30,5 @@ __FBSDID("$FreeBSD$")
 ENTRY(sqrt)
 	sqrtsd	%xmm0, %xmm0
 	ret
+END(sqrt)
 

Modified: stable/7/lib/msun/amd64/e_sqrtf.S
==============================================================================
--- stable/7/lib/msun/amd64/e_sqrtf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/e_sqrtf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -30,3 +30,4 @@ __FBSDID("$FreeBSD$")
 ENTRY(sqrtf)
 	sqrtss	%xmm0, %xmm0
 	ret
+END(sqrtf)

Modified: stable/7/lib/msun/amd64/s_lrint.S
==============================================================================
--- stable/7/lib/msun/amd64/s_lrint.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/s_lrint.S	Sat May 30 23:27:48 2009	(r193134)
@@ -34,3 +34,4 @@ __FBSDID("$FreeBSD$")
 ENTRY(fn)
 	cvtsd2si %xmm0, %rax
 	ret
+END(fn)

Modified: stable/7/lib/msun/amd64/s_lrintf.S
==============================================================================
--- stable/7/lib/msun/amd64/s_lrintf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/s_lrintf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -34,3 +34,4 @@ __FBSDID("$FreeBSD$")
 ENTRY(fn)
 	cvtss2si %xmm0, %rax
 	ret
+END(fn)

Modified: stable/7/lib/msun/amd64/s_remquo.S
==============================================================================
--- stable/7/lib/msun/amd64/s_remquo.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/s_remquo.S	Sat May 30 23:27:48 2009	(r193134)
@@ -63,3 +63,4 @@ ENTRY(remquo)
 	fstpl	-8(%rsp)
 	movsd	-8(%rsp),%xmm0
 	ret
+END(remquo)

Modified: stable/7/lib/msun/amd64/s_remquof.S
==============================================================================
--- stable/7/lib/msun/amd64/s_remquof.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/s_remquof.S	Sat May 30 23:27:48 2009	(r193134)
@@ -63,3 +63,4 @@ ENTRY(remquof)
 	fstps	-4(%rsp)
 	movss	-4(%rsp),%xmm0
 	ret
+END(remquof)

Modified: stable/7/lib/msun/amd64/s_scalbn.S
==============================================================================
--- stable/7/lib/msun/amd64/s_scalbn.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/s_scalbn.S	Sat May 30 23:27:48 2009	(r193134)
@@ -37,3 +37,4 @@ ENTRY(scalbn)
 	fstpl	-8(%rsp)
 	movsd	-8(%rsp),%xmm0
 	ret
+END(scalbn)

Modified: stable/7/lib/msun/amd64/s_scalbnf.S
==============================================================================
--- stable/7/lib/msun/amd64/s_scalbnf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/s_scalbnf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -37,6 +37,7 @@ ENTRY(scalbnf)
 	fstps	-8(%rsp)
 	movss	-8(%rsp),%xmm0
 	ret
+END(scalbnf)
 
 .globl CNAME(ldexpf)
 .set	CNAME(ldexpf),CNAME(scalbnf)

Modified: stable/7/lib/msun/amd64/s_scalbnl.S
==============================================================================
--- stable/7/lib/msun/amd64/s_scalbnl.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/amd64/s_scalbnl.S	Sat May 30 23:27:48 2009	(r193134)
@@ -14,6 +14,7 @@ ENTRY(scalbnl)
 	fscale
 	fstp	%st(1)
 	ret
+END(scalbnl)
 
 .globl	CNAME(ldexpl)
 .set	CNAME(ldexpl),CNAME(scalbnl)

Modified: stable/7/lib/msun/i387/e_exp.S
==============================================================================
--- stable/7/lib/msun/i387/e_exp.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_exp.S	Sat May 30 23:27:48 2009	(r193134)
@@ -96,3 +96,4 @@ x_Inf_or_NaN:
 x_not_minus_Inf:
 	fldl	4(%esp)
 	ret
+END(exp)

Modified: stable/7/lib/msun/i387/e_fmod.S
==============================================================================
--- stable/7/lib/msun/i387/e_fmod.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_fmod.S	Sat May 30 23:27:48 2009	(r193134)
@@ -46,3 +46,4 @@ ENTRY(fmod)
 	jp	1b
 	fstp	%st(1)
 	ret
+END(fmod)

Modified: stable/7/lib/msun/i387/e_log.S
==============================================================================
--- stable/7/lib/msun/i387/e_log.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_log.S	Sat May 30 23:27:48 2009	(r193134)
@@ -42,3 +42,4 @@ ENTRY(log)
 	fldl	4(%esp)
 	fyl2x
 	ret
+END(log)

Modified: stable/7/lib/msun/i387/e_log10.S
==============================================================================
--- stable/7/lib/msun/i387/e_log10.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_log10.S	Sat May 30 23:27:48 2009	(r193134)
@@ -42,3 +42,4 @@ ENTRY(log10)
 	fldl	4(%esp)
 	fyl2x
 	ret
+END(log10)

Modified: stable/7/lib/msun/i387/e_log10f.S
==============================================================================
--- stable/7/lib/msun/i387/e_log10f.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_log10f.S	Sat May 30 23:27:48 2009	(r193134)
@@ -13,3 +13,4 @@ ENTRY(log10f)
 	flds	4(%esp)
 	fyl2x
 	ret
+END(log10f)

Modified: stable/7/lib/msun/i387/e_remainder.S
==============================================================================
--- stable/7/lib/msun/i387/e_remainder.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_remainder.S	Sat May 30 23:27:48 2009	(r193134)
@@ -46,3 +46,4 @@ ENTRY(remainder)
 	jp	1b
 	fstp	%st(1)
 	ret
+END(remainder)

Modified: stable/7/lib/msun/i387/e_remainderf.S
==============================================================================
--- stable/7/lib/msun/i387/e_remainderf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_remainderf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -17,3 +17,4 @@ ENTRY(remainderf)
 	jp	1b
 	fstp	%st(1)
 	ret
+END(remainderf)

Modified: stable/7/lib/msun/i387/e_sqrt.S
==============================================================================
--- stable/7/lib/msun/i387/e_sqrt.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_sqrt.S	Sat May 30 23:27:48 2009	(r193134)
@@ -41,3 +41,4 @@ ENTRY(sqrt)
 	fldl	4(%esp)
 	fsqrt
 	ret
+END(sqrt)

Modified: stable/7/lib/msun/i387/e_sqrtf.S
==============================================================================
--- stable/7/lib/msun/i387/e_sqrtf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/e_sqrtf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -12,3 +12,4 @@ ENTRY(sqrtf)
 	flds	4(%esp)
 	fsqrt
 	ret
+END(sqrtf)

Modified: stable/7/lib/msun/i387/s_ceil.S
==============================================================================
--- stable/7/lib/msun/i387/s_ceil.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_ceil.S	Sat May 30 23:27:48 2009	(r193134)
@@ -56,3 +56,4 @@ ENTRY(ceil)
 
 	leave
 	ret
+END(ceil)

Modified: stable/7/lib/msun/i387/s_ceilf.S
==============================================================================
--- stable/7/lib/msun/i387/s_ceilf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_ceilf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -27,3 +27,4 @@ ENTRY(ceilf)
 
 	leave
 	ret
+END(ceilf)

Modified: stable/7/lib/msun/i387/s_ceill.S
==============================================================================
--- stable/7/lib/msun/i387/s_ceill.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_ceill.S	Sat May 30 23:27:48 2009	(r193134)
@@ -25,3 +25,4 @@ ENTRY(ceill)
 
 	leave
 	ret
+END(ceill)

Modified: stable/7/lib/msun/i387/s_copysign.S
==============================================================================
--- stable/7/lib/msun/i387/s_copysign.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_copysign.S	Sat May 30 23:27:48 2009	(r193134)
@@ -46,3 +46,4 @@ ENTRY(copysign)
 	movl	%eax,8(%esp)
 	fldl	4(%esp)
 	ret
+END(copysign)

Modified: stable/7/lib/msun/i387/s_copysignf.S
==============================================================================
--- stable/7/lib/msun/i387/s_copysignf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_copysignf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -17,3 +17,4 @@ ENTRY(copysignf)
 	movl	%eax,4(%esp)
 	flds	4(%esp)
 	ret
+END(copysignf)

Modified: stable/7/lib/msun/i387/s_copysignl.S
==============================================================================
--- stable/7/lib/msun/i387/s_copysignl.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_copysignl.S	Sat May 30 23:27:48 2009	(r193134)
@@ -15,3 +15,4 @@ ENTRY(copysignl)
 	movl	%eax,12(%esp)
 	fldt	4(%esp)
 	ret
+END(copysignl)

Modified: stable/7/lib/msun/i387/s_cos.S
==============================================================================
--- stable/7/lib/msun/i387/s_cos.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_cos.S	Sat May 30 23:27:48 2009	(r193134)
@@ -54,3 +54,4 @@ ENTRY(cos)
 	fstp	%st(1)
 	fcos
 	ret
+END(cos)

Modified: stable/7/lib/msun/i387/s_finite.S
==============================================================================
--- stable/7/lib/msun/i387/s_finite.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_finite.S	Sat May 30 23:27:48 2009	(r193134)
@@ -44,3 +44,4 @@ ENTRY(finite)
 	setneb	%al
 	andl	$0x000000ff, %eax
 	ret
+END(finite)

Modified: stable/7/lib/msun/i387/s_floor.S
==============================================================================
--- stable/7/lib/msun/i387/s_floor.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_floor.S	Sat May 30 23:27:48 2009	(r193134)
@@ -56,3 +56,4 @@ ENTRY(floor)
 
 	leave
 	ret
+END(floor)

Modified: stable/7/lib/msun/i387/s_floorf.S
==============================================================================
--- stable/7/lib/msun/i387/s_floorf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_floorf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -27,3 +27,4 @@ ENTRY(floorf)
 
 	leave
 	ret
+END(floorf)

Modified: stable/7/lib/msun/i387/s_floorl.S
==============================================================================
--- stable/7/lib/msun/i387/s_floorl.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_floorl.S	Sat May 30 23:27:48 2009	(r193134)
@@ -25,3 +25,4 @@ ENTRY(floorl)
 
 	leave
 	ret
+END(floorl)

Modified: stable/7/lib/msun/i387/s_llrint.S
==============================================================================
--- stable/7/lib/msun/i387/s_llrint.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_llrint.S	Sat May 30 23:27:48 2009	(r193134)
@@ -34,3 +34,4 @@ ENTRY(llrint)
 	popl	%eax
 	popl	%edx
 	ret
+END(llrint)

Modified: stable/7/lib/msun/i387/s_llrintf.S
==============================================================================
--- stable/7/lib/msun/i387/s_llrintf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_llrintf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -34,3 +34,4 @@ ENTRY(llrintf)
 	popl	%eax
 	popl	%edx
 	ret
+END(llrintf)

Modified: stable/7/lib/msun/i387/s_logb.S
==============================================================================
--- stable/7/lib/msun/i387/s_logb.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_logb.S	Sat May 30 23:27:48 2009	(r193134)
@@ -42,3 +42,4 @@ ENTRY(logb)
 	fxtract
 	fstp	%st
 	ret
+END(logb)

Modified: stable/7/lib/msun/i387/s_logbf.S
==============================================================================
--- stable/7/lib/msun/i387/s_logbf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_logbf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -13,3 +13,4 @@ ENTRY(logbf)
 	fxtract
 	fstp	%st
 	ret
+END(logbf)

Modified: stable/7/lib/msun/i387/s_lrint.S
==============================================================================
--- stable/7/lib/msun/i387/s_lrint.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_lrint.S	Sat May 30 23:27:48 2009	(r193134)
@@ -33,3 +33,4 @@ ENTRY(lrint)
 	fistpl	(%esp)
 	popl	%eax
 	ret
+END(lrint)

Modified: stable/7/lib/msun/i387/s_lrintf.S
==============================================================================
--- stable/7/lib/msun/i387/s_lrintf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_lrintf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -33,3 +33,4 @@ ENTRY(lrintf)
 	fistpl	(%esp)
 	popl	%eax
 	ret
+END(lrintf)

Modified: stable/7/lib/msun/i387/s_remquo.S
==============================================================================
--- stable/7/lib/msun/i387/s_remquo.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_remquo.S	Sat May 30 23:27:48 2009	(r193134)
@@ -60,3 +60,4 @@ ENTRY(remquo)
 	movl	20(%esp),%ecx
 	movl	%eax,(%ecx)
 	ret
+END(remquo)

Modified: stable/7/lib/msun/i387/s_remquof.S
==============================================================================
--- stable/7/lib/msun/i387/s_remquof.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_remquof.S	Sat May 30 23:27:48 2009	(r193134)
@@ -60,3 +60,4 @@ ENTRY(remquof)
 	movl	12(%esp),%ecx
 	movl	%eax,(%ecx)
 	ret
+END(remquof)

Modified: stable/7/lib/msun/i387/s_rint.S
==============================================================================
--- stable/7/lib/msun/i387/s_rint.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_rint.S	Sat May 30 23:27:48 2009	(r193134)
@@ -41,3 +41,4 @@ ENTRY(rint)
 	fldl	4(%esp)
 	frndint
 	ret
+END(rint)

Modified: stable/7/lib/msun/i387/s_rintf.S
==============================================================================
--- stable/7/lib/msun/i387/s_rintf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_rintf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -12,3 +12,4 @@ ENTRY(rintf)
 	flds	4(%esp)
 	frndint
 	ret
+END(rintf)

Modified: stable/7/lib/msun/i387/s_scalbn.S
==============================================================================
--- stable/7/lib/msun/i387/s_scalbn.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_scalbn.S	Sat May 30 23:27:48 2009	(r193134)
@@ -43,3 +43,4 @@ ENTRY(scalbn)
 	fscale
 	fstp	%st(1)
 	ret
+END(scalbn)

Modified: stable/7/lib/msun/i387/s_scalbnf.S
==============================================================================
--- stable/7/lib/msun/i387/s_scalbnf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_scalbnf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -14,6 +14,7 @@ ENTRY(scalbnf)
 	fscale
 	fstp	%st(1)		/* bug fix for fp stack overflow */
 	ret
+END(scalbnf)
 
 .globl CNAME(ldexpf)
 .set	CNAME(ldexpf),CNAME(scalbnf)

Modified: stable/7/lib/msun/i387/s_scalbnl.S
==============================================================================
--- stable/7/lib/msun/i387/s_scalbnl.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_scalbnl.S	Sat May 30 23:27:48 2009	(r193134)
@@ -14,6 +14,7 @@ ENTRY(scalbnl)
 	fscale
 	fstp	%st(1)
 	ret
+END(scalbnl)
 
 .globl CNAME(ldexpl)
 .set	CNAME(ldexpl),CNAME(scalbnl)

Modified: stable/7/lib/msun/i387/s_significand.S
==============================================================================
--- stable/7/lib/msun/i387/s_significand.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_significand.S	Sat May 30 23:27:48 2009	(r193134)
@@ -42,3 +42,4 @@ ENTRY(significand)
 	fxtract
 	fstp	%st(1)
 	ret
+END(significand)

Modified: stable/7/lib/msun/i387/s_significandf.S
==============================================================================
--- stable/7/lib/msun/i387/s_significandf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_significandf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -13,3 +13,4 @@ ENTRY(significandf)
 	fxtract
 	fstp	%st(1)
 	ret
+END(significandf)

Modified: stable/7/lib/msun/i387/s_sin.S
==============================================================================
--- stable/7/lib/msun/i387/s_sin.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_sin.S	Sat May 30 23:27:48 2009	(r193134)
@@ -54,3 +54,4 @@ ENTRY(sin)
 	fstp	%st(1)
 	fsin
 	ret
+END(sin)

Modified: stable/7/lib/msun/i387/s_tan.S
==============================================================================
--- stable/7/lib/msun/i387/s_tan.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_tan.S	Sat May 30 23:27:48 2009	(r193134)
@@ -56,3 +56,4 @@ ENTRY(tan)
 	fptan
 	fstp	%st(0)
 	ret
+END(tan)

Modified: stable/7/lib/msun/i387/s_trunc.S
==============================================================================
--- stable/7/lib/msun/i387/s_trunc.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_trunc.S	Sat May 30 23:27:48 2009	(r193134)
@@ -24,3 +24,4 @@ ENTRY(trunc)
 
 	leave
 	ret
+END(trunc)

Modified: stable/7/lib/msun/i387/s_truncf.S
==============================================================================
--- stable/7/lib/msun/i387/s_truncf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_truncf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -24,3 +24,4 @@ ENTRY(truncf)
 
 	leave
 	ret
+END(truncf)

Modified: stable/7/lib/msun/i387/s_truncl.S
==============================================================================
--- stable/7/lib/msun/i387/s_truncl.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/i387/s_truncl.S	Sat May 30 23:27:48 2009	(r193134)
@@ -24,3 +24,4 @@ ENTRY(truncl)
 
 	leave
 	ret
+END(truncl)

Modified: stable/7/lib/msun/ia64/s_fma.S
==============================================================================
--- stable/7/lib/msun/ia64/s_fma.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/ia64/s_fma.S	Sat May 30 23:27:48 2009	(r193134)
@@ -32,3 +32,4 @@ ENTRY(fma, 3)
 	fma.d		f8 = f8, f9, f10
 	br.ret.sptk	b0
 }
+END(fma)

Modified: stable/7/lib/msun/ia64/s_fmaf.S
==============================================================================
--- stable/7/lib/msun/ia64/s_fmaf.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/ia64/s_fmaf.S	Sat May 30 23:27:48 2009	(r193134)
@@ -32,3 +32,4 @@ ENTRY(fmaf, 3)
 	fma.s		f8 = f8, f9, f10
 	br.ret.sptk	b0
 }
+END(fmaf)

Modified: stable/7/lib/msun/ia64/s_fmal.S
==============================================================================
--- stable/7/lib/msun/ia64/s_fmal.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/lib/msun/ia64/s_fmal.S	Sat May 30 23:27:48 2009	(r193134)
@@ -32,3 +32,4 @@ ENTRY(fmal, 3)
 	fma		f8 = f8, f9, f10
 	br.ret.sptk	b0
 }
+END(fmal)

Modified: stable/7/tools/KSE/ksetest/kse_asm.S
==============================================================================
--- stable/7/tools/KSE/ksetest/kse_asm.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/tools/KSE/ksetest/kse_asm.S	Sat May 30 23:27:48 2009	(r193134)
@@ -99,6 +99,7 @@ ENTRY(uts_to_thread)
 	pop	%ebx			/* %ebx off stack */
 	popf				/* flags off stack */
 5:	ret				/* %eip off stack */
+END(uts_to_thread)
 
 /*
  * int thread_to_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km);
@@ -154,4 +155,5 @@ ENTRY(thread_to_uts)
 	pushl	KM_FUNC_OFFSET(%edx)	/* .. the uts can return to itself */
 	pushl	KM_FUNC_OFFSET(%edx)	/* push the address of the uts func */
 2:	ret
+END(thread_to_uts)
 

Modified: stable/7/tools/KSE/rr/kse_asm.S
==============================================================================
--- stable/7/tools/KSE/rr/kse_asm.S	Sat May 30 23:01:27 2009	(r193133)
+++ stable/7/tools/KSE/rr/kse_asm.S	Sat May 30 23:27:48 2009	(r193134)
@@ -99,6 +99,7 @@ ENTRY(uts_to_thread)
 	pop	%ebx			/* %ebx off stack */
 	popf				/* flags off stack */
 5:	ret				/* %eip off stack */
+END(uts_to_thread)
 
 /*
  * int thread_to_uts(struct kse_thr_mailbox *tm, struct kse_mailbox *km);
@@ -154,4 +155,5 @@ ENTRY(thread_to_uts)
 	pushl	KM_FUNC_OFFSET(%edx)	/* .. the uts can return to itself */
 	pushl	KM_FUNC_OFFSET(%edx)	/* push the address of the uts func */
 2:	ret
+END(thread_to_uts)
 
From dchagin at FreeBSD.org  Sun May 31 06:58:36 2009
From: dchagin at FreeBSD.org (Dmitry Chagin)
Date: Sun May 31 06:58:50 2009
Subject: svn commit: r193152 - in stable/7/sys: . amd64/linux32 compat/linux
	contrib/pf dev/ath/ath_hal dev/cxgb i386/linux
Message-ID: <200905310658.n4V6wZjH032344@svn.freebsd.org>

Author: dchagin
Date: Sun May 31 06:58:35 2009
New Revision: 193152
URL: http://svn.freebsd.org/changeset/base/193152

Log:
  MFC r191719:
  
  Reimplement futexes.
  Old implemention used Giant to protect the kernel data structures,
  but at the same time called malloc(M_WAITOK), that could cause the
  calling thread to sleep and lost Giant protection. User-visible
  result was the missed wakeup.
  
  New implementation uses one sx lock per futex. The sx protects
  the futex structures and allows to sleep while copyin or copyout
  are performed.
  
  Unlike linux, we return EINVAL when FUTEX_CMP_REQUEUE operation
  is requested and either caller specified futexes are equial or
  second futex already exists. This is acceptable since the situation
  can only occur from the application error, and glibc falls back to
  old FUTEX_WAKE operation when FUTEX_CMP_REQUEUE returns an error.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/amd64/linux32/linux32_sysvec.c
  stable/7/sys/compat/linux/linux_futex.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/i386/linux/linux_sysvec.c

Modified: stable/7/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- stable/7/sys/amd64/linux32/linux32_sysvec.c	Sun May 31 06:37:47 2009	(r193151)
+++ stable/7/sys/amd64/linux32/linux32_sysvec.c	Sun May 31 06:58:35 2009	(r193152)
@@ -127,7 +127,7 @@ static void	exec_linux_setregs(struct th
 static void	linux32_fixlimit(struct rlimit *rl, int which);
 
 extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct sx futex_sx;
+extern struct mtx futex_mtx;
 
 static eventhandler_tag linux_exit_tag;
 static eventhandler_tag linux_schedtail_tag;
@@ -1121,7 +1121,7 @@ linux_elf_modevent(module_t mod, int typ
 			mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF);
 			sx_init(&emul_shared_lock, "emuldata->shared lock");
 			LIST_INIT(&futex_list);
-			sx_init(&futex_sx, "futex protection lock");
+			mtx_init(&futex_mtx, "ftllk", NULL, MTX_DEF);
 			linux_exit_tag = EVENTHANDLER_REGISTER(process_exit,
 			    linux_proc_exit, NULL, 1000);
 			linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail,
@@ -1154,7 +1154,7 @@ linux_elf_modevent(module_t mod, int typ
 				linux_device_unregister_handler(*ldhp);
 			mtx_destroy(&emul_lock);
 			sx_destroy(&emul_shared_lock);
-			sx_destroy(&futex_sx);
+			mtx_destroy(&futex_mtx);
 			EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag);
 			EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag);
 			EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag);

Modified: stable/7/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.c	Sun May 31 06:37:47 2009	(r193151)
+++ stable/7/sys/compat/linux/linux_futex.c	Sun May 31 06:58:35 2009	(r193152)
@@ -62,419 +62,284 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.
 #include 
 #include 
 
+MALLOC_DEFINE(M_FUTEX, "futex", "Linux futexes");
+MALLOC_DEFINE(M_FUTEX_WP, "futex wp", "Linux futexes wp");
+
 struct futex;
 
 struct waiting_proc {
-	struct thread *wp_t;
-	struct futex *wp_new_futex;
+	uint32_t	wp_flags;
+	struct futex	*wp_futex;
 	TAILQ_ENTRY(waiting_proc) wp_list;
 };
+
 struct futex {
-	void   *f_uaddr;
-	int	f_refcount;
+	struct sx	f_lck;
+	uint32_t	*f_uaddr;
+	uint32_t	f_refcount;
 	LIST_ENTRY(futex) f_list;
 	TAILQ_HEAD(lf_waiting_proc, waiting_proc) f_waiting_proc;
 };
 
 LIST_HEAD(futex_list, futex) futex_list;
-struct sx futex_sx;		/* this protects the LIST of futexes */
-
-#define FUTEX_LOCK sx_xlock(&futex_sx)
-#define FUTEX_UNLOCK sx_xunlock(&futex_sx)
 
-#define FUTEX_LOCKED	1
-#define FUTEX_UNLOCKED	0
-
-#define FUTEX_SYSTEM_LOCK mtx_lock(&Giant)
-#define FUTEX_SYSTEM_UNLOCK mtx_unlock(&Giant)
-
-static struct futex	*futex_get(void *, int);
-static void futex_put(struct futex *);
-static int futex_sleep(struct futex *, struct thread *, unsigned long);
-static int futex_wake(struct futex *, int, struct futex *, int);
-static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr);
+#define FUTEX_LOCK(f)		sx_xlock(&(f)->f_lck)
+#define FUTEX_UNLOCK(f)		sx_xunlock(&(f)->f_lck)
+#define FUTEX_INIT(f)		sx_init_flags(&(f)->f_lck, "ftlk", 0)
+#define FUTEX_DESTROY(f)	sx_destroy(&(f)->f_lck)
+#define FUTEX_ASSERT_LOCKED(f)	sx_assert(&(f)->f_lck, SA_XLOCKED)
+
+struct mtx futex_mtx;			/* protects the futex list */
+#define FUTEXES_LOCK		mtx_lock(&futex_mtx)
+#define FUTEXES_UNLOCK		mtx_unlock(&futex_mtx)
+
+/* flags for futex_get() */
+#define FUTEX_CREATE_WP		0x1	/* create waiting_proc */
+#define FUTEX_DONTCREATE	0x2	/* don't create futex if not exists */
+#define FUTEX_DONTEXISTS	0x4	/* return EINVAL if futex exists */
+
+/* wp_flags */
+#define FUTEX_WP_REQUEUED	0x1	/* wp requeued - wp moved from wp_list
+					 * of futex where thread sleep to wp_list
+					 * of another futex.
+					 */
+#define FUTEX_WP_REMOVED	0x2	/* wp is woken up and removed from futex
+					 * wp_list to prevent double wakeup.
+					 */
 
 /* support.s */
-int futex_xchgl(int oparg, caddr_t uaddr, int *oldval);
-int futex_addl(int oparg, caddr_t uaddr, int *oldval);
-int futex_orl(int oparg, caddr_t uaddr, int *oldval);
-int futex_andl(int oparg, caddr_t uaddr, int *oldval);
-int futex_xorl(int oparg, caddr_t uaddr, int *oldval);
+int futex_xchgl(int oparg, uint32_t *uaddr, int *oldval);
+int futex_addl(int oparg, uint32_t *uaddr, int *oldval);
+int futex_orl(int oparg, uint32_t *uaddr, int *oldval);
+int futex_andl(int oparg, uint32_t *uaddr, int *oldval);
+int futex_xorl(int oparg, uint32_t *uaddr, int *oldval);
 
-int
-linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args)
+static void
+futex_put(struct futex *f, struct waiting_proc *wp)
 {
-	int val;
-	int ret;
-	struct l_timespec timeout = {0, 0};
-	int error = 0;
-	struct futex *f;
-	struct futex *newf;
-	int timeout_hz;
-	struct timeval tv = {0, 0};
-	struct futex *f2;
-	int op_ret;
-	struct linux_emuldata *em;
-
-#ifdef	DEBUG
-	if (ldebug(sys_futex))
-		printf(ARGS(futex, "%p, %i, %i, *, %p, %i"), args->uaddr, args->op,
-		    args->val, args->uaddr2, args->val3);
-#endif
-
-	/* 
-	 * Our implementation provides only privates futexes. Most of the apps
-	 * should use private futexes but don't claim so. Therefore we treat
-	 * all futexes as private by clearing the FUTEX_PRIVATE_FLAG. It works
-	 * in most cases (ie. when futexes are not shared on file descriptor
-	 * or between different processes.).
-	 */
-	args->op = (args->op & ~LINUX_FUTEX_PRIVATE_FLAG);
 
-	switch (args->op) {
-	case LINUX_FUTEX_WAIT:
-		FUTEX_SYSTEM_LOCK;
-
-		if ((error = copyin(args->uaddr,
-		    &val, sizeof(val))) != 0) {
-			FUTEX_SYSTEM_UNLOCK;
-			return error;
-		}
-
-		if (val != args->val) {
-			FUTEX_SYSTEM_UNLOCK;
-			return EWOULDBLOCK;
-		}
-
-		if (args->timeout != NULL) {
-			if ((error = copyin(args->timeout,
-			    &timeout, sizeof(timeout))) != 0) {
-				FUTEX_SYSTEM_UNLOCK;
-				return error;
-			}
-		}
-
-#ifdef DEBUG
-		if (ldebug(sys_futex))
-			printf("FUTEX_WAIT %d: val = %d, uaddr = %p, "
-			    "*uaddr = %d, timeout = %d.%09lu\n",
-			    td->td_proc->p_pid, args->val,
-			    args->uaddr, val, timeout.tv_sec,
-			    (unsigned long)timeout.tv_nsec);
-#endif
-		tv.tv_usec = timeout.tv_sec * 1000000 + timeout.tv_nsec / 1000;
-		timeout_hz = tvtohz(&tv);
-
-		if (timeout.tv_sec == 0 && timeout.tv_nsec == 0)
-			timeout_hz = 0;
-		/*
-		 * If the user process requests a non null timeout,
-		 * make sure we do not turn it into an infinite
-		 * timeout because timeout_hz gets null.
-		 *
-		 * We use a minimal timeout of 1/hz. Maybe it would
-		 * make sense to just return ETIMEDOUT without sleeping.
-		 */
-		if (((timeout.tv_sec != 0) || (timeout.tv_nsec != 0)) &&
-		    (timeout_hz == 0))
-			timeout_hz = 1;
-
-
-		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
-		ret = futex_sleep(f, td, timeout_hz);
-		futex_put(f);
-
-#ifdef DEBUG
-		if (ldebug(sys_futex))
-			printf("FUTEX_WAIT %d: uaddr = %p, "
-			    "ret = %d\n", td->td_proc->p_pid, args->uaddr, ret);
-#endif
-
-		FUTEX_SYSTEM_UNLOCK;
-		switch (ret) {
-		case EWOULDBLOCK:	/* timeout */
-			return ETIMEDOUT;
-			break;
-		case EINTR:		/* signal */
-			return EINTR;
-			break;
-		case 0:		/* FUTEX_WAKE received */
-#ifdef DEBUG
-			if (ldebug(sys_futex))
-				printf("FUTEX_WAIT %d: uaddr = %p, "
-				    "got FUTEX_WAKE\n",
-				    td->td_proc->p_pid, args->uaddr);
-#endif
-			return 0;
-			break;
-		default:
-#ifdef DEBUG
-			if (ldebug(sys_futex))
-				printf("FUTEX_WAIT: unexpected ret = %d\n",
-				    ret);
-#endif
-			break;
-		}
-
-		/* NOTREACHED */
-		break;
-
-	case LINUX_FUTEX_WAKE:
-		FUTEX_SYSTEM_LOCK;
-
-		/*
-		 * XXX: Linux is able to cope with different addresses
-		 * corresponding to the same mapped memory in the sleeping
-		 * and waker process(es).
-		 */
-#ifdef DEBUG
-		if (ldebug(sys_futex))
-			printf("FUTEX_WAKE %d: uaddr = %p, val = %d\n",
-			    td->td_proc->p_pid, args->uaddr, args->val);
-#endif
-		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
-		td->td_retval[0] = futex_wake(f, args->val, NULL, 0);
-		futex_put(f);
-
-		FUTEX_SYSTEM_UNLOCK;
-		break;
-
-	case LINUX_FUTEX_CMP_REQUEUE:
-		FUTEX_SYSTEM_LOCK;
+	FUTEX_ASSERT_LOCKED(f);
+	if (wp != NULL) {
+		if ((wp->wp_flags & FUTEX_WP_REMOVED) == 0)
+			TAILQ_REMOVE(&f->f_waiting_proc, wp, wp_list);
+		free(wp, M_FUTEX_WP);
+	}
 
-		if ((error = copyin(args->uaddr,
-		    &val, sizeof(val))) != 0) {
-			FUTEX_SYSTEM_UNLOCK;
-			return error;
-		}
+	FUTEXES_LOCK;
+	if (--f->f_refcount == 0) {
+		LIST_REMOVE(f, f_list);
+		FUTEXES_UNLOCK;
+		FUTEX_UNLOCK(f);
 
-		if (val != args->val3) {
-			FUTEX_SYSTEM_UNLOCK;
-			return EAGAIN;
-		}
+		FUTEX_DESTROY(f);
+		free(f, M_FUTEX);
+		return;
+	}
 
-		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
-		newf = futex_get(args->uaddr2, FUTEX_UNLOCKED);
-		td->td_retval[0] = futex_wake(f, args->val, newf,
-		    (int)(unsigned long)args->timeout);
-		futex_put(f);
-		futex_put(newf);
+	FUTEXES_UNLOCK;
+	FUTEX_UNLOCK(f);
+}
 
-		FUTEX_SYSTEM_UNLOCK;
-		break;
+static int
+futex_get0(uint32_t *uaddr, struct futex **newf, uint32_t flags)
+{
+	struct futex *f, *tmpf;
 
-	case LINUX_FUTEX_WAKE_OP:
-		FUTEX_SYSTEM_LOCK;
-#ifdef DEBUG
-		if (ldebug(sys_futex))
-			printf("FUTEX_WAKE_OP: %d: uaddr = %p, op = %d, "
-			    "val = %x, uaddr2 = %p, val3 = %x\n",
-			    td->td_proc->p_pid, args->uaddr, args->op,
-			    args->val, args->uaddr2, args->val3);
-#endif
-		f = futex_get(args->uaddr, FUTEX_UNLOCKED);
-		f2 = futex_get(args->uaddr2, FUTEX_UNLOCKED);
+	*newf = tmpf = NULL;
 
-		/*
-		 * This function returns positive number as results and
-		 * negative as errors
-		 */
-		op_ret = futex_atomic_op(td, args->val3, args->uaddr2);
-#ifdef DEBUG
-		if (ldebug(sys_futex))
-			printf("futex_atomic_op ret %d\n", op_ret);
-#endif
-		if (op_ret < 0) {
-			/* XXX: We don't handle the EFAULT yet. */
-			if (op_ret != -EFAULT) {
-				futex_put(f);
-				futex_put(f2);
-				FUTEX_SYSTEM_UNLOCK;
-				return (-op_ret);
+retry:
+	FUTEXES_LOCK;
+	LIST_FOREACH(f, &futex_list, f_list) {
+		if (f->f_uaddr == uaddr) {
+			if (tmpf != NULL) {
+				FUTEX_UNLOCK(tmpf);
+				FUTEX_DESTROY(tmpf);
+				free(tmpf, M_FUTEX);
+			}
+			if (flags & FUTEX_DONTEXISTS) {
+				FUTEXES_UNLOCK;
+				return (EINVAL);
 			}
 
-			futex_put(f);
-			futex_put(f2);
-
-			FUTEX_SYSTEM_UNLOCK;
-			return (EFAULT);
-		}
-
-		ret = futex_wake(f, args->val, NULL, 0);
-		futex_put(f);
-		if (op_ret > 0) {
-			op_ret = 0;
 			/*
-			 * Linux abuses the address of the timespec parameter
-			 * as the number of retries.
+			 * Increment refcount of the found futex to
+			 * prevent it from deallocation before FUTEX_LOCK()
 			 */
-			op_ret += futex_wake(f2,
-			    (int)(unsigned long)args->timeout, NULL, 0);
-			ret += op_ret;
-		}
-		futex_put(f2);
-		td->td_retval[0] = ret;
-
-		FUTEX_SYSTEM_UNLOCK;
-		break;
-
-	case LINUX_FUTEX_LOCK_PI:
-		/* not yet implemented */
-		return (ENOSYS);
+			++f->f_refcount;
+			FUTEXES_UNLOCK;
 
-	case LINUX_FUTEX_UNLOCK_PI:
-		/* not yet implemented */
-		return (ENOSYS);
+			FUTEX_LOCK(f);
+			*newf = f;
+			return (0);
+		}
+	}
 
-	case LINUX_FUTEX_TRYLOCK_PI:
-		/* not yet implemented */
-		return (ENOSYS);
+	if (flags & FUTEX_DONTCREATE) {
+		FUTEXES_UNLOCK;
+		return (0);
+	}
 
-	case LINUX_FUTEX_REQUEUE:
+	if (tmpf == NULL) {
+		FUTEXES_UNLOCK;
+		tmpf = malloc(sizeof(*tmpf), M_FUTEX, M_WAITOK | M_ZERO);
+		tmpf->f_uaddr = uaddr;
+		tmpf->f_refcount = 1;
+		FUTEX_INIT(tmpf);
+		TAILQ_INIT(&tmpf->f_waiting_proc);
 
 		/*
-		 * Glibc does not use this operation since Jun 2004 (2.3.3),
-		 * as it is racy and replaced by FUTEX_CMP_REQUEUE operation.
-		 * Glibc versions prior to 2.3.3 fall back to FUTEX_WAKE when
-		 * FUTEX_REQUEUE returned EINVAL.
+		 * Lock the new futex before an insert into the futex_list
+		 * to prevent futex usage by other.
 		 */
-		em = em_find(td->td_proc, EMUL_DONTLOCK);
-		if (em->used_requeue == 0) {
-			printf("linux(%s (%d)) sys_futex: "
-			    "unsupported futex_requeue op\n",
-			    td->td_proc->p_comm, td->td_proc->p_pid);
-			em->used_requeue = 1;
-		}
-		return (EINVAL);
-
-	default:
-		printf("linux_sys_futex: unknown op %d\n",
-		    args->op);
-		return (ENOSYS);
+		FUTEX_LOCK(tmpf);
+		goto retry;
 	}
+
+	LIST_INSERT_HEAD(&futex_list, tmpf, f_list);
+	FUTEXES_UNLOCK;
+
+	*newf = tmpf;
 	return (0);
 }
 
-static struct futex *
-futex_get(void *uaddr, int locked)
+static int
+futex_get(uint32_t *uaddr, struct waiting_proc **wp, struct futex **f,
+    uint32_t flags)
 {
-	struct futex *f;
+	int error;
 
-	if (locked == FUTEX_UNLOCKED)
-		FUTEX_LOCK;
-	LIST_FOREACH(f, &futex_list, f_list) {
-		if (f->f_uaddr == uaddr) {
-			f->f_refcount++;
-			if (locked == FUTEX_UNLOCKED)
-				FUTEX_UNLOCK;
-			return f;
-		}
+	if (flags & FUTEX_CREATE_WP) {
+		*wp = malloc(sizeof(struct waiting_proc), M_FUTEX_WP, M_WAITOK);
+		(*wp)->wp_flags = 0;
+	}
+	error = futex_get0(uaddr, f, flags);
+	if (error) {
+		if (flags & FUTEX_CREATE_WP)
+			free(*wp, M_FUTEX_WP);
+		return (error);
+	}
+	if (flags & FUTEX_CREATE_WP) {
+		TAILQ_INSERT_HEAD(&(*f)->f_waiting_proc, *wp, wp_list);
+		(*wp)->wp_futex = *f;
 	}
 
-	f = malloc(sizeof(*f), M_LINUX, M_WAITOK);
-	f->f_uaddr = uaddr;
-	f->f_refcount = 1;
-	TAILQ_INIT(&f->f_waiting_proc);
-	LIST_INSERT_HEAD(&futex_list, f, f_list);
-	if (locked == FUTEX_UNLOCKED)
-		FUTEX_UNLOCK;
-
-	return f;
+	return (error);
 }
 
-static void
-futex_put(f)
-	struct futex *f;
+static int
+futex_sleep(struct futex *f, struct waiting_proc *wp, unsigned long timeout)
 {
-	FUTEX_LOCK;
-	f->f_refcount--;
-	if (f->f_refcount == 0) {
-		LIST_REMOVE(f, f_list);
-		free(f, M_LINUX);
+	int error;
+
+	FUTEX_ASSERT_LOCKED(f);
+	error = sx_sleep(wp, &f->f_lck, PCATCH, "futex", timeout);
+	if (wp->wp_flags & FUTEX_WP_REQUEUED) {
+		KASSERT(f != wp->wp_futex, ("futex != wp_futex"));
+		futex_put(f, NULL);
+		f = wp->wp_futex;
+		FUTEX_LOCK(f);
 	}
-	FUTEX_UNLOCK;
 
-	return;
+	futex_put(f, wp);
+	return (error);
 }
 
 static int
-futex_sleep(struct futex *f, struct thread *td, unsigned long timeout)
+futex_wake(struct futex *f, int n)
 {
-	struct waiting_proc *wp;
-	int ret;
-
-	wp = malloc(sizeof(*wp), M_LINUX, M_WAITOK);
-	wp->wp_t = td;
-	wp->wp_new_futex = NULL;
-	FUTEX_LOCK;
-	TAILQ_INSERT_TAIL(&f->f_waiting_proc, wp, wp_list);
-	FUTEX_UNLOCK;
-
-#ifdef DEBUG
-	if (ldebug(sys_futex))
-		printf("FUTEX --> %d tlseep timeout = %ld\n",
-		    td->td_proc->p_pid, timeout);
-#endif
-	ret = tsleep(wp, PCATCH | PZERO, "linuxfutex", timeout);
-#ifdef DEBUG
-	if (ldebug(sys_futex))
-		printf("FUTEX -> %d tsleep returns %d\n",
-		    td->td_proc->p_pid, ret);
-#endif
+	struct waiting_proc *wp, *wpt;
+	int count = 0;
 
-	FUTEX_LOCK;
-	TAILQ_REMOVE(&f->f_waiting_proc, wp, wp_list);
-	FUTEX_UNLOCK;
-
-	/* if we got woken up in futex_wake */
-	if ((ret == 0) && (wp->wp_new_futex != NULL)) {
-		/* suspend us on the new futex */
-		ret = futex_sleep(wp->wp_new_futex, td, timeout);
-		/* and release the old one */
-		futex_put(wp->wp_new_futex);
+	FUTEX_ASSERT_LOCKED(f);
+	TAILQ_FOREACH_SAFE(wp, &f->f_waiting_proc, wp_list, wpt) {
+		wp->wp_flags |= FUTEX_WP_REMOVED;
+		TAILQ_REMOVE(&f->f_waiting_proc, wp, wp_list);
+		wakeup_one(wp);
+		if (++count == n)
+			break;
 	}
 
-	free(wp, M_LINUX);
-
-	return ret;
+	return (count);
 }
 
 static int
-futex_wake(struct futex *f, int n, struct futex *newf, int n2)
+futex_requeue(struct futex *f, int n, struct futex *f2, int n2)
 {
-	struct waiting_proc *wp;
-	int count;
+	struct waiting_proc *wp, *wpt;
+	int count = 0;
 
-	/*
-	 * Linux is very strange it wakes up N threads for
-	 * all operations BUT requeue ones where its N+1
-	 * mimic this.
-	 */
-	count = newf ? 0 : 1;
+	FUTEX_ASSERT_LOCKED(f);
+	FUTEX_ASSERT_LOCKED(f2);
 
-	FUTEX_LOCK;
-	TAILQ_FOREACH(wp, &f->f_waiting_proc, wp_list) {
-		if (count <= n) {
+	TAILQ_FOREACH_SAFE(wp, &f->f_waiting_proc, wp_list, wpt) {
+		if (++count <= n) {
+			wp->wp_flags |= FUTEX_WP_REMOVED;
+			TAILQ_REMOVE(&f->f_waiting_proc, wp, wp_list);
 			wakeup_one(wp);
-			count++;
 		} else {
-			if (newf != NULL) {
-				/* futex_put called after tsleep */
-				wp->wp_new_futex = futex_get(newf->f_uaddr,
-				    FUTEX_LOCKED);
-				wakeup_one(wp);
-				if (count - n >= n2)
-					break;
-			}
+			wp->wp_flags |= FUTEX_WP_REQUEUED;
+			/* Move wp to wp_list of f2 futex */
+			TAILQ_REMOVE(&f->f_waiting_proc, wp, wp_list);
+			TAILQ_INSERT_HEAD(&f2->f_waiting_proc, wp, wp_list);
+
+			/*
+			 * Thread which sleeps on wp after waking should
+			 * acquire f2 lock, so increment refcount of f2 to
+			 * prevent it from premature deallocation.
+			 */
+			wp->wp_futex = f2;
+			FUTEXES_LOCK;
+			++f2->f_refcount;
+			FUTEXES_UNLOCK;
+			if (count - n >= n2)
+				break;
 		}
 	}
-	FUTEX_UNLOCK;
 
-	return count;
+	return (count);
+}
+
+static int
+futex_wait(struct futex *f, struct waiting_proc *wp, struct l_timespec *ts)
+{
+	struct l_timespec timeout = {0, 0};
+	struct timeval tv = {0, 0};
+	int timeout_hz;
+	int error;
+
+	if (ts != NULL) {
+		error = copyin(ts, &timeout, sizeof(timeout));
+		if (error)
+			return (error);
+	}
+
+	tv.tv_usec = timeout.tv_sec * 1000000 + timeout.tv_nsec / 1000;
+	timeout_hz = tvtohz(&tv);
+
+	if (timeout.tv_sec == 0 && timeout.tv_nsec == 0)
+		timeout_hz = 0;
+
+	/*
+	 * If the user process requests a non null timeout,
+	 * make sure we do not turn it into an infinite
+	 * timeout because timeout_hz gets null.
+	 *
+	 * We use a minimal timeout of 1/hz. Maybe it would
+	 * make sense to just return ETIMEDOUT without sleeping.
+	 */
+	if (((timeout.tv_sec != 0) || (timeout.tv_nsec != 0)) &&
+	    (timeout_hz == 0))
+		timeout_hz = 1;
+
+	error = futex_sleep(f, wp, timeout_hz);
+	if (error == EWOULDBLOCK)
+		error = ETIMEDOUT;
+
+	return (error);
 }
 
 static int
-futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr)
+futex_atomic_op(struct thread *td, int encoded_op, uint32_t *uaddr)
 {
 	int op = (encoded_op >> 28) & 7;
 	int cmp = (encoded_op >> 24) & 15;
@@ -536,14 +401,237 @@ futex_atomic_op(struct thread *td, int e
 }
 
 int
+linux_sys_futex(struct thread *td, struct linux_sys_futex_args *args)
+{
+	int op_ret, val, ret, nrwake;
+	struct linux_emuldata *em;
+	struct waiting_proc *wp;
+	struct futex *f, *f2;
+	int error = 0;
+
+	/*
+	 * Our implementation provides only privates futexes. Most of the apps
+	 * should use private futexes but don't claim so. Therefore we treat
+	 * all futexes as private by clearing the FUTEX_PRIVATE_FLAG. It works
+	 * in most cases (ie. when futexes are not shared on file descriptor
+	 * or between different processes.).
+	 */
+	args->op = (args->op & ~LINUX_FUTEX_PRIVATE_FLAG);
+
+	switch (args->op) {
+	case LINUX_FUTEX_WAIT:
+
+#ifdef DEBUG
+		if (ldebug(sys_futex))
+			printf(ARGS(sys_futex, "futex_wait val %d uaddr %p"),
+			    args->val, args->uaddr);
+#endif
+		error = futex_get(args->uaddr, &wp, &f, FUTEX_CREATE_WP);
+		if (error)
+			return (error);
+		error = copyin(args->uaddr, &val, sizeof(val));
+		if (error) {
+			futex_put(f, wp);
+			return (error);
+		}
+		if (val != args->val) {
+#ifdef DEBUG
+			if (ldebug(sys_futex))
+				printf(ARGS(sys_futex, "futex_wait uaddr %p WHOOPS %d != %d"),
+				    args->uaddr, args->val, val);
+#endif
+			futex_put(f, wp);
+			return (EWOULDBLOCK);
+		}
+
+		error = futex_wait(f, wp, args->timeout);
+		break;
+
+	case LINUX_FUTEX_WAKE:
+
+		/*
+		 * XXX: Linux is able to cope with different addresses
+		 * corresponding to the same mapped memory in the sleeping
+		 * and waker process(es).
+		 */
+#ifdef DEBUG
+		if (ldebug(sys_futex))
+			printf(ARGS(sys_futex, "futex_wake val %d uaddr %p"),
+			    args->val, args->uaddr);
+#endif
+		error = futex_get(args->uaddr, NULL, &f, FUTEX_DONTCREATE);
+		if (error)
+			return (error);
+		if (f == NULL) {
+			td->td_retval[0] = 0;
+			return (error);;
+		}
+		td->td_retval[0] = futex_wake(f, args->val);
+		futex_put(f, NULL);
+		break;
+
+	case LINUX_FUTEX_CMP_REQUEUE:
+
+#ifdef DEBUG
+		if (ldebug(sys_futex))
+			printf(ARGS(sys_futex, "futex_cmp_requeue uaddr %p "
+			    "val %d val3 %d uaddr2 %p val2 %d"),
+			    args->uaddr, args->val, args->val3, args->uaddr2,
+			    (int)(unsigned long)args->timeout);
+#endif
+
+		/*
+		 * Linux allows this, we would not, it is an incorrect
+		 * usage of declared ABI, so return EINVAL.
+		 */
+		if (args->uaddr == args->uaddr2)
+			return (EINVAL);
+		error = futex_get0(args->uaddr, &f, 0);
+		if (error)
+			return (error);
+
+		/*
+		 * To avoid deadlocks return EINVAL if second futex
+		 * exists at this time. Otherwise create the new futex
+		 * and ignore false positive LOR which thus happens.
+		 *
+		 * Glibc fall back to FUTEX_WAKE in case of any error
+		 * returned by FUTEX_CMP_REQUEUE.
+		 */
+		error = futex_get0(args->uaddr2, &f2, FUTEX_DONTEXISTS);
+		if (error) {
+			futex_put(f, NULL);
+			return (error);
+		}
+		error = copyin(args->uaddr, &val, sizeof(val));
+		if (error) {
+			futex_put(f2, NULL);
+			futex_put(f, NULL);
+			return (error);
+		}
+		if (val != args->val3) {
+#ifdef DEBUG
+			if (ldebug(sys_futex))
+				printf(ARGS(sys_futex, "futex_cmp_requeue WHOOPS"
+				    " VAL %d != UVAL %d"), args->val, val);
+#endif
+			futex_put(f2, NULL);
+			futex_put(f, NULL);
+			return (EAGAIN);
+		}
+
+		nrwake = (int)(unsigned long)args->timeout;
+		td->td_retval[0] = futex_requeue(f, args->val, f2, nrwake);
+		futex_put(f2, NULL);
+		futex_put(f, NULL);
+		break;
+
+	case LINUX_FUTEX_WAKE_OP:
+
+#ifdef DEBUG
+		if (ldebug(sys_futex))
+			printf(ARGS(sys_futex, "futex_wake_op "
+			    "uaddr %p op %d val %x uaddr2 %p val3 %x"),
+			    args->uaddr, args->op, args->val,
+			    args->uaddr2, args->val3);
+#endif
+		error = futex_get0(args->uaddr, &f, 0);
+		if (error)
+			return (error);
+		if (args->uaddr != args->uaddr2)
+			error = futex_get0(args->uaddr2, &f2, 0);
+		if (error) {
+			futex_put(f, NULL);
+			return (error);
+		}
+
+		/*
+		 * This function returns positive number as results and
+		 * negative as errors
+		 */
+		op_ret = futex_atomic_op(td, args->val3, args->uaddr2);
+
+		if (op_ret < 0) {
+			/* XXX: We don't handle the EFAULT yet. */
+			if (op_ret != -EFAULT) {
+				if (f2 != NULL)
+					futex_put(f2, NULL);
+				futex_put(f, NULL);
+				return (-op_ret);
+			}
+			if (f2 != NULL)
+				futex_put(f2, NULL);
+			futex_put(f, NULL);
+			return (EFAULT);
+		}
+
+		ret = futex_wake(f, args->val);
+
+		if (op_ret > 0) {
+			op_ret = 0;
+			nrwake = (int)(unsigned long)args->timeout;
+
+			if (f2 != NULL)
+				op_ret += futex_wake(f2, nrwake);
+			else
+				op_ret += futex_wake(f, nrwake);
+			ret += op_ret;
+
+		}
+		if (f2 != NULL)
+			futex_put(f2, NULL);
+		futex_put(f, NULL);
+		td->td_retval[0] = ret;
+		break;
+
+	case LINUX_FUTEX_LOCK_PI:
+		/* not yet implemented */
+		return (ENOSYS);
+
+	case LINUX_FUTEX_UNLOCK_PI:
+		/* not yet implemented */
+		return (ENOSYS);
+
+	case LINUX_FUTEX_TRYLOCK_PI:
+		/* not yet implemented */
+		return (ENOSYS);
+
+	case LINUX_FUTEX_REQUEUE:
+
+		/*
+		 * Glibc does not use this operation since version 2.3.3,
+		 * as it is racy and replaced by FUTEX_CMP_REQUEUE operation.
+		 * Glibc versions prior to 2.3.3 fall back to FUTEX_WAKE when
+		 * FUTEX_REQUEUE returned EINVAL.
+		 */
+		em = em_find(td->td_proc, EMUL_DONTLOCK);
+		if (em->used_requeue == 0) {
+			printf("linux(%s (%d)) sys_futex: "
+			"unsupported futex_requeue op\n",
+			td->td_proc->p_comm, td->td_proc->p_pid);
+				em->used_requeue = 1;
+		}
+		return (EINVAL);
+
+	default:
+		printf("linux_sys_futex: unknown op %d\n", args->op);
+		return (ENOSYS);
+	}
+
+	return (error);
+}
+
+int
 linux_set_robust_list(struct thread *td, struct linux_set_robust_list_args *args)
 {
 	struct linux_emuldata *em;
 
-#ifdef	DEBUG
+#ifdef DEBUG
 	if (ldebug(set_robust_list))
-		printf(ARGS(set_robust_list, ""));
+		printf(ARGS(set_robust_list, "head %p len %d"),
+		    args->head, args->len);
 #endif
+
 	if (args->len != sizeof(struct linux_robust_list_head))
 		return (EINVAL);
 
@@ -598,16 +686,16 @@ linux_get_robust_list(struct thread *td,
 }
 
 static int
-handle_futex_death(void *uaddr, pid_t pid, int pi)
+handle_futex_death(struct proc *p, uint32_t *uaddr, int pi)
 {
-	int uval, nval, mval;
+	uint32_t uval, nval, mval;
 	struct futex *f;
+	int error;
 
 retry:
 	if (copyin(uaddr, &uval, 4))
 		return (EFAULT);
-
-	if ((uval & FUTEX_TID_MASK) == pid) {
+	if ((uval & FUTEX_TID_MASK) == p->p_pid) {
 		mval = (uval & FUTEX_WAITERS) | FUTEX_OWNER_DIED;
 		nval = casuword32(uaddr, uval, mval);
 
@@ -618,8 +706,14 @@ retry:
 			goto retry;
 
 		if (!pi && (uval & FUTEX_WAITERS)) {
-			f = futex_get(uaddr, FUTEX_UNLOCKED);
-			futex_wake(f, 1, NULL, 0);
+			error = futex_get(uaddr, NULL, &f,
+			    FUTEX_DONTCREATE);
+			if (error)
+				return (error);
+			if (f != NULL) {
+				futex_wake(f, 1);
+				futex_put(f, NULL);
+			}
 		}
 	}
 
@@ -671,10 +765,8 @@ release_futexes(struct proc *p)
 		rc = fetch_robust_entry(&next_entry, PTRIN(&entry->next), &next_pi);
 
 		if (entry != pending)
-			if (handle_futex_death((char *)entry + futex_offset,
-			    p->p_pid, pi))
+			if (handle_futex_death(p, (uint32_t *)entry + futex_offset, pi))
 				return;
-
 		if (rc)
 			return;
 
@@ -688,6 +780,5 @@ release_futexes(struct proc *p)
 	}
 
 	if (pending)
-		handle_futex_death((char *) pending + futex_offset,
-		    p->p_pid, pip);
+		handle_futex_death(p, (uint32_t *)pending + futex_offset, pip);
 }

Modified: stable/7/sys/i386/linux/linux_sysvec.c
==============================================================================
--- stable/7/sys/i386/linux/linux_sysvec.c	Sun May 31 06:37:47 2009	(r193151)
+++ stable/7/sys/i386/linux/linux_sysvec.c	Sun May 31 06:58:35 2009	(r193152)
@@ -111,7 +111,7 @@ static int linux_szplatform;
 const char *linux_platform;
 
 extern LIST_HEAD(futex_list, futex) futex_list;
-extern struct sx futex_sx;
+extern struct mtx futex_mtx;
 
 static eventhandler_tag linux_exit_tag;
 static eventhandler_tag linux_schedtail_tag;
@@ -1091,7 +1091,7 @@ linux_elf_modevent(module_t mod, int typ
 			mtx_init(&emul_lock, "emuldata lock", NULL, MTX_DEF);
 			sx_init(&emul_shared_lock, "emuldata->shared lock");
 			LIST_INIT(&futex_list);
-			sx_init(&futex_sx, "futex protection lock");
+			mtx_init(&futex_mtx, "ftllk", NULL, MTX_DEF);
 			linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit,
 			      NULL, 1000);
 			linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail,
@@ -1125,7 +1125,7 @@ linux_elf_modevent(module_t mod, int typ
 				linux_device_unregister_handler(*ldhp);
 			mtx_destroy(&emul_lock);
 			sx_destroy(&emul_shared_lock);
-			sx_destroy(&futex_sx);
+			mtx_destroy(&futex_mtx);
 			EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag);
 			EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag);
 			EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag);
From ed at FreeBSD.org  Sun May 31 18:06:13 2009
From: ed at FreeBSD.org (Ed Schouten)
Date: Sun May 31 18:06:20 2009
Subject: svn commit: r193180 - in stable/7/share/man: . man3 man4 man5 man7
	man8 man9
Message-ID: <200905311806.n4VI6Dk9050936@svn.freebsd.org>

Author: ed
Date: Sun May 31 18:06:12 2009
New Revision: 193180
URL: http://svn.freebsd.org/changeset/base/193180

Log:
  MFC r190855:
  
    Add C++ operators to operator(7) manual page.
  
    Submitted by:	Christoph Mallon 

Modified:
  stable/7/share/man/   (props changed)
  stable/7/share/man/man3/   (props changed)
  stable/7/share/man/man4/   (props changed)
  stable/7/share/man/man4/igb.4   (props changed)
  stable/7/share/man/man5/   (props changed)
  stable/7/share/man/man7/   (props changed)
  stable/7/share/man/man7/operator.7
  stable/7/share/man/man8/   (props changed)
  stable/7/share/man/man9/   (props changed)

Modified: stable/7/share/man/man7/operator.7
==============================================================================
--- stable/7/share/man/man7/operator.7	Sun May 31 18:03:06 2009	(r193179)
+++ stable/7/share/man/man7/operator.7	Sun May 31 18:06:12 2009	(r193180)
@@ -32,19 +32,20 @@
 .\"	@(#)operator.7	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD$
 .\"
-.Dd January 22, 2003
+.Dd April 8, 2009
 .Dt OPERATOR 7
 .Os
 .Sh NAME
 .Nm operator
-.Nd C operator precedence and order of evaluation
+.Nd C and C++ operator precedence and order of evaluation
 .Sh DESCRIPTION
 .Bd -ragged -offset indent -compact
-.Bl -column "= += -= *= /= %= <<= >>= &= ^= |="
+.Bl -column "! ~ ++ -- - (type) * & sizeof new delete"
 .It Sy "Operator	Associativity"
 .It "--------	-------------"
 .It "() [] -> .	left to right"
-.It "! ~ ++ -- - (type) * & sizeof	right to left"
+.It "! ~ ++ -- - (type) * & sizeof new delete	right to left"
+.It "->* .*	left to right
 .It "* / %	left to right"
 .It "+ -	left to right"
 .It "<< >>	left to right"
@@ -56,7 +57,8 @@
 .It "&&	left to right"
 .It "||	left to right"
 .It "?:	right to left"
-.It "= += -= *= /= %= <<= >>= &= ^= |=	right to left"
+.It "= += -= *= /= %= <<= >>= &= ^= |= throw	right to left"
+.It "?: (C++, third operand)	right to left"
 .It ",	left to right"
 .El
 .Ed
From ed at FreeBSD.org  Sun May 31 18:14:25 2009
From: ed at FreeBSD.org (Ed Schouten)
Date: Sun May 31 18:14:37 2009
Subject: svn commit: r193182 - stable/7/share/misc
Message-ID: <200905311814.n4VIEOGV051320@svn.freebsd.org>

Author: ed
Date: Sun May 31 18:14:24 2009
New Revision: 193182
URL: http://svn.freebsd.org/changeset/base/193182

Log:
  Correct the previous commit.
  
  Also merge the operator file in share/misc, that is also part of r190855.

Modified:
  stable/7/share/misc/   (props changed)
  stable/7/share/misc/iso639   (props changed)
  stable/7/share/misc/operator

Modified: stable/7/share/misc/operator
==============================================================================
--- stable/7/share/misc/operator	Sun May 31 18:06:46 2009	(r193181)
+++ stable/7/share/misc/operator	Sun May 31 18:14:24 2009	(r193182)
@@ -1,19 +1,21 @@
-Operator				Associativity
------------------------------------------------------
-() [] -> .				left to right
-! ~ ++ -- - (type) * & sizeof		right to left
-* / %					left to right
-+ -					left to right
-<< >>					left to right
-< <= > >=				left to right
-== !=					left to right
-&					left to right
-^					left to right
-|					left to right
-&&					left to right
-||					left to right
-?:					right to left
-= += -= *= /= %= <<= >>= &= ^= |=	right to left
-,					left to right
+Operator					Associativity
+-------------------------------------------------------------
+() [] -> .					left to right
+! ~ ++ -- - (type) * & sizeof new delete	right to left
+->* .*						left to right
+* / %						left to right
++ -						left to right
+<< >>						left to right
+< <= > >=					left to right
+== !=						left to right
+&						left to right
+^						left to right
+|						left to right
+&&						left to right
+||						left to right
+?:						right to left
+= += -= *= /= %= <<= >>= &= ^= |= throw		right to left
+?: (C++, third operand)				right to left
+,						left to right
 
 $FreeBSD$
