From 28f4018c7f5e8d3831b02cfa82a45ea476a9fb75 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 4 Jun 2018 09:27:42 +0200
Subject: [PATCH] Resolve some kernel option / .Cd mismatches.

* There is no WATCHDOG option. kern_wdog.c is compiled into the kernel
  by default.

* SC_NO_PALETTE_LOADING was never a kernel option, so remove the
  associated #ifndefs.

* powernow(4) can't be compiled into the kernel
---
 share/man/man4/powernow.4       | 14 +++++++-------
 share/man/man4/syscons.4        |  4 +---
 share/man/man5/rc.conf.5        |  4 +---
 sys/dev/misc/syscons/scvidctl.c |  4 ----
 sys/dev/misc/syscons/syscons.c  |  8 --------
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/share/man/man4/powernow.4 b/share/man/man4/powernow.4
index bd1992206e..7363ae95ed 100644
--- a/share/man/man4/powernow.4
+++ b/share/man/man4/powernow.4
@@ -29,19 +29,19 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd October 10, 2014
+.Dd June 4, 2018
 .Dt POWERNOW 4
 .Os
 .Sh NAME
 .Nm powernow
 .Nd PowerNow! Technology support
 .Sh SYNOPSIS
-To compile this driver into the kernel, place the following line in your
-kernel configuration file:
-.Bd -ragged -offset indent
-.Cd "options CPU_ENABLE_POWERNOW"
-.Ed
-.Pp
+.\"To compile this driver into the kernel, place the following line in your
+.\"kernel configuration file:
+.\".Bd -ragged -offset indent
+.\".Cd "options CPU_ENABLE_POWERNOW"
+.\".Ed
+.\".Pp
 To load this driver as a module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index fdfe0fae9f..616a12997a 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/syscons.4,v 1.10.2.14 2003/04/25 21:21:36 brueffer Exp $
 .\"
-.Dd August 14, 2015
+.Dd June 4, 2018
 .Dt SYSCONS 4
 .Os
 .Sh NAME
@@ -43,7 +43,6 @@
 .Cd "options SC_NO_CUTPASTE"
 .Cd "options SC_NO_FONT_LOADING"
 .Cd "options SC_NO_HISTORY"
-.Cd "options SC_NO_PALETTE_LOADING"
 .Cd "options SC_NO_SYSMOUSE"
 .Cd "options SC_PIXEL_MODE"
 .Cd "options SC_TWOBUTTON_MOUSE"
@@ -402,7 +401,6 @@ the mouse with this option then you must also use the
 option.
 .It Dv SC_NO_HISTORY
 This option disables back-scrolling in virtual terminals.
-.\".It Dv SC_NO_PALETTE_LOADING
 .It Dv SC_NO_SYSMOUSE
 This option removes mouse support in the
 .Nm
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index b128ee8f5c..f354d0f85b 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.197 2003/07/28 13:56:00 mbr Exp $
 .\"
-.Dd April 21, 2018
+.Dd June 4, 2018
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -2222,8 +2222,6 @@ If set to
 start the
 .Xr watchdogd 8
 daemon at boot time.
-This requires that the kernel have been compiled with
-.Cd "options WATCHDOG" .
 .It Va jail_enable
 .Pq Vt bool
 If set to
diff --git a/sys/dev/misc/syscons/scvidctl.c b/sys/dev/misc/syscons/scvidctl.c
index 146d17ee58..20afae9210 100644
--- a/sys/dev/misc/syscons/scvidctl.c
+++ b/sys/dev/misc/syscons/scvidctl.c
@@ -675,10 +675,8 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag)
 #endif /* SC_NO_FONT_LOADING */
 #endif
 
-#ifndef SC_NO_PALETTE_LOADING
 	    if (scp->sc->fbi == NULL)
 		load_palette(adp, scp->sc->palette);
-#endif
 
 	    /* move hardware cursor out of the way */
 	    if (scp->sc->fbi == NULL)
@@ -735,9 +733,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag)
 	    crit_exit();
 	    if (scp == scp->sc->cur_scp) {
 		set_mode(scp);
-#ifndef SC_NO_PALETTE_LOADING
 		load_palette(adp, scp->sc->palette);
-#endif
 	    }
 	    sc_clear_screen(scp);
 	    scp->status &= ~UNKNOWN_MODE;
diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c
index e988a579ab..2dbd7f0ea1 100644
--- a/sys/dev/misc/syscons/syscons.c
+++ b/sys/dev/misc/syscons/syscons.c
@@ -2617,10 +2617,8 @@ set_scrn_saver_mode(scr_stat *scp, int mode, u_char *pal, int border)
 	    scp->sc->adp->va_info.vi_flags & V_INFO_GRAPHICS) {
 	    scp->status |= GRAPHICS_MODE;
 	}
-#ifndef SC_NO_PALETTE_LOADING
 	if (scp->sc->fbi == NULL && pal != NULL)
 	    load_palette(scp->sc->adp, pal);
-#endif
 	sc_set_border(scp, border);
 	return 0;
     } else {
@@ -2656,10 +2654,8 @@ restore_scrn_saver_mode(scr_stat *scp, int changemode)
 	return 0;
     }
     if (set_mode(scp) == 0) {
-#ifndef SC_NO_PALETTE_LOADING
 	if (scp->sc->fbi == NULL)
 	    load_palette(scp->sc->adp, scp->sc->palette);
-#endif
 	--scrn_blanked;
 	crit_exit();
 	return 0;
@@ -3076,10 +3072,8 @@ exchange_scr(sc_softc_t *sc)
     sc_move_cursor(scp, scp->xpos, scp->ypos);
     if (!ISGRAPHSC(scp))
 	sc_set_cursor_image(scp);
-#ifndef SC_NO_PALETTE_LOADING
     if (sc->fbi == NULL && ISGRAPHSC(sc->old_scp))
 	load_palette(sc->adp, sc->palette);
-#endif
     if (!ISGRAPHSC(scp) || sc->fbi == NULL)
 	sc_set_border(scp, scp->border);
 
@@ -3394,10 +3388,8 @@ scinit(int unit, int flags)
 	}
 #endif /* !SC_NO_FONT_LOADING */
 
-#ifndef SC_NO_PALETTE_LOADING
 	if (!(flags & SC_EFI_FB))
 	    save_palette(sc->adp, sc->palette);
-#endif
 
 #if NSPLASH > 0
 	if (!(sc->flags & SC_SPLASH_SCRN) && (flags & SC_KERNEL_CONSOLE)) {
-- 
2.41.0