Merge tag 'printk-for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...

[platform/kernel/linux-rpi.git] / kernel / debug / kdb / kdb_main.c

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 405d24a..1baa96a 100644 (file)
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -2077,7 +2077,7 @@ static int kdb_dmesg(int argc, const char **argv)
        int adjust = 0;
        int n = 0;
        int skip = 0;
-       struct kmsg_dumper dumper = { .active = 1 };
+       struct kmsg_dump_iter iter;
        size_t len;
        char buf[201];
 
@@ -2102,8 +2102,8 @@ static int kdb_dmesg(int argc, const char **argv)
                kdb_set(2, setargs);
        }
 
-       kmsg_dump_rewind_nolock(&dumper);
-       while (kmsg_dump_get_line_nolock(&dumper, 1, NULL, 0, NULL))
+       kmsg_dump_rewind(&iter);
+       while (kmsg_dump_get_line(&iter, 1, NULL, 0, NULL))
                n++;
 
        if (lines < 0) {
@@ -2135,8 +2135,8 @@ static int kdb_dmesg(int argc, const char **argv)
        if (skip >= n || skip < 0)
                return 0;
 
-       kmsg_dump_rewind_nolock(&dumper);
-       while (kmsg_dump_get_line_nolock(&dumper, 1, buf, sizeof(buf), &len)) {
+       kmsg_dump_rewind(&iter);
+       while (kmsg_dump_get_line(&iter, 1, buf, sizeof(buf), &len)) {
                if (skip) {
                        skip--;
                        continue;