The register_console_force function was introduced to register consoles
even on the presence of default consoles, replacing the CON_ENABLE flag
that was forcing the same behavior.

Signed-off-by: Marcos Paulo de Souza <[email protected]>
---
 drivers/net/netconsole.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index bb6e03a92956..509ab629d95f 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -583,16 +583,14 @@ static ssize_t enabled_store(struct config_item *item,
                }
 
                if (nt->extended && !console_is_registered(&netconsole_ext)) {
-                       netconsole_ext.flags |= CON_ENABLED;
-                       register_console(&netconsole_ext);
+                       register_console_force(&netconsole_ext);
                }
 
                /* User might be enabling the basic format target for the very
                 * first time, make sure the console is registered.
                 */
                if (!nt->extended && !console_is_registered(&netconsole)) {
-                       netconsole.flags |= CON_ENABLED;
-                       register_console(&netconsole);
+                       register_console_force(&netconsole);
                }
 
                /*
@@ -1917,13 +1915,12 @@ static void free_param_target(struct netconsole_target 
*nt)
 
 static struct console netconsole_ext = {
        .name   = "netcon_ext",
-       .flags  = CON_ENABLED | CON_EXTENDED,
+       .flags  = CON_EXTENDED,
        .write  = write_ext_msg,
 };
 
 static struct console netconsole = {
        .name   = "netcon",
-       .flags  = CON_ENABLED,
        .write  = write_msg,
 };
 
@@ -1971,9 +1968,9 @@ static int __init init_netconsole(void)
                goto undonotifier;
 
        if (console_type_needed & CONS_EXTENDED)
-               register_console(&netconsole_ext);
+               register_console_force(&netconsole_ext);
        if (console_type_needed & CONS_BASIC)
-               register_console(&netconsole);
+               register_console_force(&netconsole);
        pr_info("network logging started\n");
 
        return err;

-- 
2.52.0


Reply via email to