[OS-663] Post-6.5 Illumos sync

Merge https://github.com/illumos/illumos-gate

Conflicts:
	exception_lists/packaging
	usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
	usr/src/cmd/lp/Makefile
	usr/src/cmd/lp/cmd/lpadmin/options.c
	usr/src/cmd/lp/cmd/lpfilter.c
	usr/src/cmd/lp/cmd/lpforms.c
	usr/src/cmd/lp/cmd/lpusers.c
	usr/src/cmd/lp/lib/lp/isterminfo.c
	usr/src/cmd/lp/lib/lp/tidbit.c
	usr/src/cmd/terminfo/att.ti
	usr/src/cmd/zpool/zpool_main.c
	usr/src/common/dis/i386/dis_tables.c
	usr/src/lib/libdtrace/common/dt_options.c
	usr/src/lib/libzfs/common/libzfs_dataset.c
	usr/src/man/man1m/dladm.1m
	usr/src/man/man1m/flowadm.1m
	usr/src/man/man1m/zoneadm.1m
	usr/src/man/man1m/zonecfg.1m
	usr/src/pkg/manifests/print-lp-print-client-commands.mf
	usr/src/pkg/manifests/print-lp.mf
	usr/src/uts/common/fs/zfs/sys/zio.h
	usr/src/uts/common/fs/zfs/zio.c
	usr/src/uts/i86pc/ml/mach_offsets.in
	usr/src/uts/intel/amd64/ml/mach_offsets.in
	usr/src/uts/intel/sys/tss.h

1 files changed, 8 insertions, 19 deletions

diff --git a/usr/src/man/man3c/rwlock.3c b/usr/src/man/man3c/rwlock.3c
index 21ad7bf460..8d5b8d59c3 100644
--- a/usr/src/man/man3c/rwlock.3c
+++ b/usr/src/man/man3c/rwlock.3c
@@ -3,7 +3,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH rwlock 3C "14 May 1998" "SunOS 5.11" "Standard C Library Functions"
+.TH RWLOCK 3C "May 14, 1998"
 .SH NAME
 rwlock, rwlock_init, rwlock_destroy, rw_rdlock, rw_wrlock, rw_tryrdlock,
 rw_trywrlock, rw_unlock \- multiple readers, single writer locks
@@ -12,7 +12,7 @@ rw_trywrlock, rw_unlock \- multiple readers, single writer locks
 .nf
 cc -mt [ \fIflag\fR... ] \fIfile\fR...[ \fIlibrary\fR... ]
 
-#include <synch.h> 
+#include <synch.h>
 
 \fBint\fR \fBrwlock_init\fR(\fBrwlock_t *\fR\fIrwlp\fR, \fBint\fR \fItype\fR, \fBvoid *\fR \fIarg\fR);
 .fi
@@ -73,12 +73,10 @@ by way of  \fIarg\fR.
 The \fItype\fR argument can be one of the following:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBUSYNC_PROCESS\fR \fR
 .ad
 .RS 18n
-.rt  
 The readers/writer lock can synchronize threads in this process and other
 processes. The readers/writer lock should be initialized by only one process.
 \fIarg\fR is ignored. A readers/writer lock initialized with this type, must be
@@ -90,12 +88,10 @@ shared memory.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBUSYNC_THREAD\fR \fR
 .ad
 .RS 18n
-.rt  
 The readers/writer lock can synchronize  threads in this process, only.
 \fIarg\fR is ignored.
 .RE
@@ -114,7 +110,7 @@ The following are default readers/writer lock initialization (intra-process):
 .nf
 rwlock_t rwlp;
 rwlock_init(&rwlp, NULL, NULL);
-   
+
 .fi
 .in -2
 
@@ -197,12 +193,10 @@ returned to indicate the error.
 The \fBrwlock_init()\fR function will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR \fR
 .ad
 .RS 11n
-.rt  
 \fBtype\fR is invalid.
 .RE
 
@@ -211,12 +205,10 @@ The \fBrwlock_init()\fR function will fail if:
 The  \fBrw_tryrdlock()\fR or \fBrw_trywrlock()\fR functions will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEBUSY\fR \fR
 .ad
 .RS 10n
-.rt  
 The reader or writer lock pointed to by \fIrwlp\fR was already locked.
 .RE
 
@@ -225,12 +217,10 @@ The reader or writer lock pointed to by \fIrwlp\fR was already locked.
 These functions may fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEFAULT\fR \fR
 .ad
 .RS 11n
-.rt  
 \fIrwlp\fR or \fIarg\fR points to an illegal address.
 .RE
 
@@ -242,13 +232,12 @@ See \fBattributes\fR(5) for descriptions of the following attributes:
 
 .sp
 .TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
+box;
+c | c
+l | l .
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-MT-LevelMT-Safe
+MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO