diff options
| author | Petr Mladek <pmladek@suse.com> | 2021-04-27 14:32:09 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-04-27 14:32:09 +0200 |
| commit | c8dbea6df351df211216b5f8877b020f21ecf75f (patch) | |
| tree | 85e752c1543e08ec217eb901379d56ce31213d20 /kernel/debug | |
| parent | da34b03fbd0a6e58770d5fe00830674633a57d60 (diff) | |
| parent | acebb5597ff182e52a225400a459052a70dae706 (diff) | |
| download | linux-c8dbea6df351df211216b5f8877b020f21ecf75f.tar.gz linux-c8dbea6df351df211216b5f8877b020f21ecf75f.tar.bz2 linux-c8dbea6df351df211216b5f8877b020f21ecf75f.zip | |
Merge branch 'printk-rework' into for-linus
Diffstat (limited to 'kernel/debug')
| -rw-r--r-- | kernel/debug/kdb/kdb_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 930ac1b25ec7..67d9f2403b52 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -2101,7 +2101,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]; @@ -2126,8 +2126,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) { @@ -2159,8 +2159,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; |