[illumos-gate merge]

commit 90c559d0abd58b80b54e9bdcfab3b4382f8b68ec
    10200 loader: spinconsole updates
commit 9c7c0c4b592ecf39e7c580cc9b779c7202794a11
    10186 uts: font functions should check if the char is from the input domain
commit e61d7e85ebb4a7361eeb10639b742a92e0bf5e55
    10067 Miscellaneous man page typos
commit c7749d0f58752c136e82d09f71ff14b1c2ce91f7
    10208 Add x86 features for L1TF
commit 33d05bc1b89915cf87dec3f6f9f2d5743fc9ea70
    10196 Add 'framebuffer?' command to loader
commit fe4e42e2947308b70ca67636d033b989c8ab5450
    10204 uts: add dboot map debug printf

	Conflicts:
	usr/src/uts/intel/sys/x86_archext.h
	usr/src/uts/i86pc/os/cpuid.c

4 files changed, 8 insertions, 23 deletions

diff --git a/usr/src/man/man3c/pthread_getschedparam.3c b/usr/src/man/man3c/pthread_getschedparam.3c
index 19a30e9b09..c335b0d8c8 100644
--- a/usr/src/man/man3c/pthread_getschedparam.3c
+++ b/usr/src/man/man3c/pthread_getschedparam.3c
@@ -65,7 +65,6 @@ cc -mt [ \fIflag\fR... ] \fIfile\fR... -lpthread [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpthread_getschedparam()\fR and \fBpthread_setschedparam()\fR functions
 allow the scheduling policy and scheduling parameters of individual threads
@@ -147,15 +146,13 @@ parameters provided in \fIpolicy\fR and \fIparam\fR, respectively.
 If the \fBpthread_setschedparam()\fR function fails, no scheduling parameters
 will be changed  for the target thread.
 .SH RETURN VALUES
-.sp
 .LP
 If successful, the \fBpthread_getschedparam()\fR and
 \fBpthread_setschedparam()\fR functions return  \fB0\fR. Otherwise, an error
 number is returned to indicate the error.
 .SH ERRORS
-.sp
 .LP
-The \fBpthread_getschedparam()\fR and \fBpthread_gsetschedparam()\fR functions
+The \fBpthread_getschedparam()\fR and \fBpthread_setschedparam()\fR functions
 will fail if:
 .sp
 .ne 2
@@ -190,7 +187,6 @@ scheduling parameters or the scheduling policy of the specified thread.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -210,7 +206,6 @@ Standard	See \fBstandards\fR(5).
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpthread_attr_init\fR(3C), \fBsched_getparam\fR(3C),
 \fBsched_get_priority_max\fR(3C), \fBsched_get_priority_max\fR(3C),
diff --git a/usr/src/man/man3c/pthread_rwlock_rdlock.3c b/usr/src/man/man3c/pthread_rwlock_rdlock.3c
index cb0d5893bf..d2603d2d72 100644
--- a/usr/src/man/man3c/pthread_rwlock_rdlock.3c
+++ b/usr/src/man/man3c/pthread_rwlock_rdlock.3c
@@ -63,7 +63,6 @@ cc -mt [ \fIflag\fR... ] \fIfile\fR... -lpthread [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpthread_rwlock_rdlock()\fR function applies a read lock to the
 read-write lock referenced by \fIrwlock\fR.  The calling thread acquires the
@@ -93,7 +92,7 @@ The \fBpthread_rwlock_tryrdlock()\fR function applies a read lock like the
 \fBpthread_rwlock_rdlock()\fR function, with the exception that the function
 fails if the equivalent \fBpthread_rwlock_rdlock()\fR call would have blocked
 the calling thread.  In no case will the \fBpthread_rwlock_tryrdlock()\fR
-function ever bloc. It always either acquires the lock or fails and returns
+function ever block. It always either acquires the lock or fails and returns
 immediately.
 .sp
 .LP
@@ -105,7 +104,6 @@ If a signal is delivered to a thread waiting for a read-write lock for reading,
 upon return from the signal handler the thread resumes waiting for the
 read-write lock for reading as if it was not interrupted.
 .SH RETURN VALUES
-.sp
 .LP
 If successful, the \fBpthread_rwlock_rdlock()\fR function returns \fB0\fR.
 Otherwise, an error number is returned to indicate the error.
@@ -115,7 +113,6 @@ The \fBpthread_rwlock_tryrdlock()\fR function returns \fB0\fR if the lock for
 reading on the read-write lock object referenced by \fIrwlock\fR is acquired.
 Otherwise an error number  is returned to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBpthread_rwlock_rdlock()\fR and \fBpthread_rwlock_tryrdlock()\fR
 functions will fail if:
@@ -155,7 +152,6 @@ the lock or a writer with the appropriate priority was blocked on it.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See  \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -173,7 +169,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBpthread_rwlock_init\fR(3C), \fBpthread_rwlock_wrlock\fR(3C),
 \fBpthread_rwlockattr_init\fR(3C), \fBpthread_rwlock_unlock\fR(3C),
diff --git a/usr/src/man/man3c/pthread_rwlock_timedwrlock.3c b/usr/src/man/man3c/pthread_rwlock_timedwrlock.3c
index 542a0dbe38..a75e7cfcd3 100644
--- a/usr/src/man/man3c/pthread_rwlock_timedwrlock.3c
+++ b/usr/src/man/man3c/pthread_rwlock_timedwrlock.3c
@@ -65,7 +65,6 @@ cc \fB-mt\fR [ \fIflag\fR... ] \fIfile\fR... [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBpthread_rwlock_timedwrlock()\fR function applies a write lock to the
 read-write lock referenced by \fIrwlock\fR as in the
@@ -89,7 +88,7 @@ interval specified by \fIrel_timeout\fR passes, as measured by the
 The resolution of the timeout is the resolution of the \fBCLOCK_REALTIME\fR
 clock. The \fBtimespec\fR data type is defined in the <\fBtime.h\fR> header.
 Under no circumstances does either function fail with a timeout if the lock can
-be acquired immediately. The validity of the a\fIbs_timeout\fR parameter need
+be acquired immediately. The validity of the \fIabs_timeout\fR parameter need
 not be checked if the lock can be immediately acquired.
 .sp
 .LP
@@ -104,14 +103,12 @@ The calling thread can deadlock if at the time the call is made it holds the
 read-write lock. The results are undefined if this function is called with an
 uninitialized read-write lock.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBpthread_rwlock_timedwrlock()\fR and
 \fBpthread_rwlock_reltimedwrlock_np()\fR functions return 0 if the lock for
 writing on the read-write lock object referenced by \fIrwlock\fR is acquired.
 Otherwise, an error number is returned to indicate the error.
 .SH ERRORS
-.sp
 .LP
 The \fBpthread_rwlock_timedwrlock()\fR and
 \fBpthread_rwlock_reltimedwrlock_np()\fR functions will fail if:
@@ -149,7 +146,6 @@ or equal to 1,000 million.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -171,7 +167,6 @@ MT-Level	MT-Safe
 The \fBpthread_rwlock_timedwrlock()\fR function is Standard. The
 \fBpthread_rwlock_reltimedwrlock_np()\fR function is Stable.
 .SH SEE ALSO
-.sp
 .LP
 \fBpthread_rwlock_destroy\fR(3C), \fBpthread_rwlock_rdlock\fR(3C),
 \fBpthread_rwlock_timedrdlock\fR(3C), \fBpthread_rwlock_trywrlock\fR(3C),
diff --git a/usr/src/man/man3c/select.3c b/usr/src/man/man3c/select.3c
index 95c94d7e3b..92ea534aaf 100644
--- a/usr/src/man/man3c/select.3c
+++ b/usr/src/man/man3c/select.3c
@@ -164,7 +164,7 @@ descriptors from zero through
 in the descriptor sets are examined.
 .Pp
 If the
-.Fa readfs
+.Fa readfds
 argument is not a null pointer, it points to an object of
 type
 .Vt fd_set
@@ -173,7 +173,7 @@ for being ready to read, and on output indicates which file descriptors are
 ready to read.
 .Pp
 If the
-.Fa writefs
+.Fa writefds
 argument is not a null pointer, it points to an object of
 type
 .Vt fd_set
@@ -191,8 +191,8 @@ for error conditions pending, and on output indicates which file descriptors
 have error conditions pending.
 .Pp
 Upon successful completion, the objects pointed to by the
-.Fa readfs ,
-.Fa writefs ,
+.Fa readfds ,
+.Fa writefds ,
 and
 .Fa errorfds
 arguments are modified to indicate which file descriptors are ready for reading,
@@ -354,7 +354,7 @@ masks to be set to a non-zero value,
 completes successfully and returns 0.
 .Pp
 If the
-.Fa readfs ,
+.Fa readfds ,
 .Fa writefds ,
 and
 .Fa errorfds