diff options
| -rw-r--r-- | drivers/char/vt.c | 21 | ||||
| -rw-r--r-- | include/linux/vt_kern.h | 2 |
2 files changed, 19 insertions, 4 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 8a389b314624..45b33cf97643 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -2869,7 +2869,8 @@ int __init vty_init(void) | |||
| 2869 | 2869 | ||
| 2870 | static struct class *vtconsole_class; | 2870 | static struct class *vtconsole_class; |
| 2871 | 2871 | ||
| 2872 | int bind_con_driver(const struct consw *csw, int first, int last, int deflt) | 2872 | static int bind_con_driver(const struct consw *csw, int first, int last, |
| 2873 | int deflt) | ||
| 2873 | { | 2874 | { |
| 2874 | struct module *owner = csw->owner; | 2875 | struct module *owner = csw->owner; |
| 2875 | const char *desc = NULL; | 2876 | const char *desc = NULL; |
| @@ -2968,7 +2969,6 @@ err: | |||
| 2968 | module_put(owner); | 2969 | module_put(owner); |
| 2969 | return retval; | 2970 | return retval; |
| 2970 | }; | 2971 | }; |
| 2971 | EXPORT_SYMBOL(bind_con_driver); | ||
| 2972 | 2972 | ||
| 2973 | #ifdef CONFIG_VT_HW_CONSOLE_BINDING | 2973 | #ifdef CONFIG_VT_HW_CONSOLE_BINDING |
| 2974 | static int con_is_graphics(const struct consw *csw, int first, int last) | 2974 | static int con_is_graphics(const struct consw *csw, int first, int last) |
| @@ -2987,6 +2987,23 @@ static int con_is_graphics(const struct consw *csw, int first, int last) | |||
| 2987 | return retval; | 2987 | return retval; |
| 2988 | } | 2988 | } |
| 2989 | 2989 | ||
| 2990 | /** | ||
| 2991 | * unbind_con_driver - unbind a console driver | ||
| 2992 | * @csw: pointer to console driver to unregister | ||
| 2993 | * @first: first in range of consoles that @csw should be unbound from | ||
| 2994 | * @last: last in range of consoles that @csw should be unbound from | ||
| 2995 | * @deflt: should next bound console driver be default after @csw is unbound? | ||
| 2996 | * | ||
| 2997 | * To unbind a driver from all possible consoles, pass 0 as @first and | ||
| 2998 | * %MAX_NR_CONSOLES as @last. | ||
| 2999 | * | ||
| 3000 | * @deflt controls whether the console that ends up replacing @csw should be | ||
| 3001 | * the default console. | ||
| 3002 | * | ||
| 3003 | * RETURNS: | ||
| 3004 | * -ENODEV if @csw isn't a registered console driver or can't be unregistered | ||
| 3005 | * or 0 on success. | ||
| 3006 | */ | ||
| 2990 | int unbind_con_driver(const struct consw *csw, int first, int last, int deflt) | 3007 | int unbind_con_driver(const struct consw *csw, int first, int last, int deflt) |
| 2991 | { | 3008 | { |
| 2992 | struct module *owner = csw->owner; | 3009 | struct module *owner = csw->owner; |
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 0d034d89ee8a..699b7e9864fa 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h | |||
| @@ -75,8 +75,6 @@ int con_copy_unimap(struct vc_data *dst_vc, struct vc_data *src_vc); | |||
| 75 | int vt_waitactive(int vt); | 75 | int vt_waitactive(int vt); |
| 76 | void change_console(struct vc_data *new_vc); | 76 | void change_console(struct vc_data *new_vc); |
| 77 | void reset_vc(struct vc_data *vc); | 77 | void reset_vc(struct vc_data *vc); |
| 78 | extern int bind_con_driver(const struct consw *csw, int first, int last, | ||
| 79 | int deflt); | ||
| 80 | extern int unbind_con_driver(const struct consw *csw, int first, int last, | 78 | extern int unbind_con_driver(const struct consw *csw, int first, int last, |
| 81 | int deflt); | 79 | int deflt); |
| 82 | 80 | ||
