From bcfb2e3dd2857118789264db68c723b0023a131a Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Tue, 21 Jul 2015 20:30:06 +0000 Subject: [PATCH] vt: De-static VT_SYSCTL_INT-defined objects Explicitly mark existing VT_SYSCTL_INTs static. This is in preparation for D2181. Reviewed by: dumbbell, emaste Approved by: markj (mentor) MFC after: 1 week --- sys/dev/vt/vt.h | 2 +- sys/dev/vt/vt_core.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index bdfcf46808cf..ee1b3c37f898 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -83,7 +83,7 @@ #define ISSIGVALID(sig) ((sig) > 0 && (sig) < NSIG) #define VT_SYSCTL_INT(_name, _default, _descr) \ -static int vt_##_name = (_default); \ +int vt_##_name = (_default); \ SYSCTL_INT(_kern_vt, OID_AUTO, _name, CTLFLAG_RWTUN, &vt_##_name, 0, _descr) struct vt_driver; diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 907a4a11266e..360663dea38a 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -121,22 +121,22 @@ const struct terminal_class vt_termclass = { (vw)->vw_number) static SYSCTL_NODE(_kern, OID_AUTO, vt, CTLFLAG_RD, 0, "vt(9) parameters"); -VT_SYSCTL_INT(enable_altgr, 1, "Enable AltGr key (Do not assume R.Alt as Alt)"); -VT_SYSCTL_INT(enable_bell, 1, "Enable bell"); -VT_SYSCTL_INT(debug, 0, "vt(9) debug level"); -VT_SYSCTL_INT(deadtimer, 15, "Time to wait busy process in VT_PROCESS mode"); -VT_SYSCTL_INT(suspendswitch, 1, "Switch to VT0 before suspend"); +static VT_SYSCTL_INT(enable_altgr, 1, "Enable AltGr key (Do not assume R.Alt as Alt)"); +static VT_SYSCTL_INT(enable_bell, 1, "Enable bell"); +static VT_SYSCTL_INT(debug, 0, "vt(9) debug level"); +static VT_SYSCTL_INT(deadtimer, 15, "Time to wait busy process in VT_PROCESS mode"); +static VT_SYSCTL_INT(suspendswitch, 1, "Switch to VT0 before suspend"); /* Allow to disable some keyboard combinations. */ -VT_SYSCTL_INT(kbd_halt, 1, "Enable halt keyboard combination. " +static VT_SYSCTL_INT(kbd_halt, 1, "Enable halt keyboard combination. " "See kbdmap(5) to configure."); -VT_SYSCTL_INT(kbd_poweroff, 1, "Enable Power Off keyboard combination. " +static VT_SYSCTL_INT(kbd_poweroff, 1, "Enable Power Off keyboard combination. " "See kbdmap(5) to configure."); -VT_SYSCTL_INT(kbd_reboot, 1, "Enable reboot keyboard combination. " +static VT_SYSCTL_INT(kbd_reboot, 1, "Enable reboot keyboard combination. " "See kbdmap(5) to configure (typically Ctrl-Alt-Delete)."); -VT_SYSCTL_INT(kbd_debug, 1, "Enable key combination to enter debugger. " +static VT_SYSCTL_INT(kbd_debug, 1, "Enable key combination to enter debugger. " "See kbdmap(5) to configure (typically Ctrl-Alt-Esc)."); -VT_SYSCTL_INT(kbd_panic, 0, "Enable request to panic. " +static VT_SYSCTL_INT(kbd_panic, 0, "Enable request to panic. " "See kbdmap(5) to configure."); static struct vt_device vt_consdev;