diff options
| -rw-r--r-- | fs/pstore/platform.c | 4 | ||||
| -rwxr-xr-x | tools/testing/selftests/pstore/pstore_tests | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 715396bef0ea..e8690d8606e0 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -514,13 +514,15 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c) } static struct console pstore_console = { - .name = "pstore", .write = pstore_console_write, .index = -1, }; static void pstore_register_console(void) { + /* Show which backend is going to get console writes. */ + strscpy(pstore_console.name, psinfo->name, + sizeof(pstore_console.name)); /* * Always initialize flags here since prior unregister_console() * calls may have changed settings (specifically CON_ENABLED). diff --git a/tools/testing/selftests/pstore/pstore_tests b/tools/testing/selftests/pstore/pstore_tests index 1cef54458aff..2aa9a3852a84 100755 --- a/tools/testing/selftests/pstore/pstore_tests +++ b/tools/testing/selftests/pstore/pstore_tests @@ -10,7 +10,7 @@ . ./common_tests prlog -n "Checking pstore console is registered ... " -dmesg | grep -q "console \[pstore" +dmesg | grep -Eq "console \[(pstore|${backend})" show_result $? prlog -n "Checking /dev/pmsg0 exists ... " |