I created a patch for removing the modifications.
Code: Select all
diff -rupN a/drivers/of/base.c b/drivers/of/base.c
--- a/drivers/of/base.c 2016-10-29 22:52:02.000000000 +0200
+++ b/drivers/of/base.c 2016-11-04 11:59:07.049568281 +0100
@@ -2077,8 +2077,6 @@ void of_alias_scan(void * (*dt_alloc)(u6
name = of_get_property(of_aliases, "stdout", NULL);
if (name)
of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
- if (of_stdout)
- console_set_by_of();
}
if (!of_aliases)
diff -rupN a/include/linux/console.h b/include/linux/console.h
--- a/include/linux/console.h 2016-10-29 22:52:02.000000000 +0200
+++ b/include/linux/console.h 2016-11-04 12:00:22.808701652 +0100
@@ -173,12 +173,6 @@ static inline void console_sysfs_notify(
#endif
extern bool console_suspend_enabled;
-#ifdef CONFIG_OF
-extern void console_set_by_of(void);
-#else
-static inline void console_set_by_of(void) {}
-#endif
-
/* Suspend and resume console messages over PM events */
extern void suspend_console(void);
extern void resume_console(void);
diff -rupN a/kernel/printk/printk.c b/kernel/printk/printk.c
--- a/kernel/printk/printk.c 2016-10-29 22:52:02.000000000 +0200
+++ b/kernel/printk/printk.c 2016-11-04 12:04:36.083094450 +0100
@@ -253,17 +253,6 @@ static int preferred_console = -1;
int console_set_on_cmdline;
EXPORT_SYMBOL(console_set_on_cmdline);
-#ifdef CONFIG_OF
-static bool of_specified_console;
-
-void console_set_by_of(void)
-{
- of_specified_console = true;
-}
-#else
-# define of_specified_console false
-#endif
-
/* Flag: console code may call schedule() */
static int console_may_schedule;
@@ -2657,7 +2646,7 @@ void register_console(struct console *ne
* didn't select a console we take the first one
* that registers here.
*/
- if (preferred_console < 0 && !of_specified_console) {
+ if (preferred_console < 0) {
if (newcon->index < 0)
newcon->index = 0;
if (newcon->setup == NULL ||
Cheers,
Christian