[illumos-gate merge]

commit 78b029b7f02730d3acc32084cd9fc419a0d0fb50
    7942 uts: drm does not need to include font.h
commit 1f5a410a2f9465ac293999ba49d50a742bb55a46
    7937 rcapadm.1m incorrectly refers to rcapstat(1SRM)
commit aa3c82a1eb83308d262b03dbffe9969658c7045b
    7805 want faster clock_gettime (fix clean)

4 files changed, 4 insertions, 10 deletions

diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index a50c8d84be..f8924130a7 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -1072,7 +1072,7 @@ BUILD.AR= $(RM) $@ ; \
 	$(AR) q $@ `$(LORDER) $(MOSTOBJS:%=$(DIR)/%) | $(GREP) -v ' L ' | $(TSORT)`
 
 # extra files for the clean target
-CLEANFILES+=			\
+CLEANFILES +=			\
 	$(LIBCDIR)/port/gen/errlst.c	\
 	$(LIBCDIR)/port/gen/new_list.c	\
 	assym.h			\
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 057c702447..3911e443c7 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -1132,7 +1132,7 @@ BUILD.AR= $(RM) $@ ; \
 	$(AR) q $@ `$(LORDER) $(MOSTOBJS:%=$(DIR)/%) | $(GREP) -v ' L ' | $(TSORT)`
 
 # extra files for the clean target
-CLEANFILES+=			\
+CLEANFILES +=			\
 	$(LIBCDIR)/port/gen/errlst.c	\
 	$(LIBCDIR)/port/gen/new_list.c	\
 	assym.h			\
diff --git a/usr/src/man/man1m/rcapadm.1m b/usr/src/man/man1m/rcapadm.1m
index f52141574c..182d135896 100644
--- a/usr/src/man/man1m/rcapadm.1m
+++ b/usr/src/man/man1m/rcapadm.1m
@@ -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 RCAPADM 1M "Dec 18, 2006"
+.TH RCAPADM 1M "Mar 5, 2017"
 .SH NAME
 rcapadm \- configure resource capping daemon
 .SH SYNOPSIS
@@ -20,7 +20,6 @@ rcapadm \- configure resource capping daemon
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBrcapadm\fR command allows a user with the privileges described below to
 configure various attributes of the resource capping daemon. If used without
@@ -33,7 +32,6 @@ available to users with all privileges and to users who have the Process
 Management profile in their list of profiles. The System Administrator role
 includes the Process Management profile.
 .SH OPTIONS
-.sp
 .ne 2
 .na
 \fB\fB-c\fR \fIpercent\fR\fR
@@ -106,7 +104,7 @@ is every 5 seconds. The minimum value is 1 second.
 .ad
 .RS 10n
 The interval at which various paging statistics are updated by \fBrcapd\fR, in
-seconds. These statistics can be viewed by using \fBrcapstat\fR(1SRM). The
+seconds. These statistics can be viewed by using \fBrcapstat\fR(1). The
 default reporting interval is every 5 seconds. When the interval is set to
 \fB0\fR, statistics will not be updated.
 .LP
@@ -203,7 +201,6 @@ reboot. To set a persistent cap, use \fBzonecfg\fR(1M).
 .sp
 
 .SH EXIT STATUS
-.sp
 .LP
 The following exit values are returned:
 .sp
@@ -236,7 +233,6 @@ Invalid command-line options were specified.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -255,7 +251,6 @@ Interface Stability	Evolving
 .LP
 The \fB-z\fR and \fB-m\fR options are committed interfaces.
 .SH SEE ALSO
-.sp
 .LP
 \fBrcapstat\fR(1), \fBrcapd\fR(1M), \fBzonecfg\fR(1M), \fBproject\fR(4),
 \fBattributes\fR(5), \fBzones\fR(5)
diff --git a/usr/src/uts/common/io/drm/drm_sunmod.h b/usr/src/uts/common/io/drm/drm_sunmod.h
index 30d126fc4b..07acb2fc9c 100644
--- a/usr/src/uts/common/io/drm/drm_sunmod.h
+++ b/usr/src/uts/common/io/drm/drm_sunmod.h
@@ -55,7 +55,6 @@ extern "C" {
 #include <sys/conf.h>
 #include <sys/kmem.h>
 #include <sys/visual_io.h>
-#include <sys/font.h>
 #include <sys/fbio.h>
 #include <sys/ddi.h>
 #include <sys/sunddi.h>