Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c064da47144b11be4697a4611f640086a663016a

Authored by Anton Vorontsov
Committed by Linus Torvalds
1 parent 533827c921
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

kdb: Switch to nolock variants of kmsg_dump functions 

The locked variants are prone to deadlocks (suppose we got to the
debugger w/ the logbuf lock held), so let's switch to nolock variants.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

kernel/debug/kdb/kdb_main.c
Diff comments   View file @ c064da4
... ... @@ -2072,8 +2072,8 @@
2072 2072 kdb_set(2, setargs);
2073 2073 }
2074 2074  
2075   - kmsg_dump_rewind(&dumper);
2076   - while (kmsg_dump_get_line(&dumper, 1, NULL, 0, NULL))
  2075 + kmsg_dump_rewind_nolock(&dumper);
  2076 + while (kmsg_dump_get_line_nolock(&dumper, 1, NULL, 0, NULL))
2077 2077 n++;
2078 2078  
2079 2079 if (lines < 0) {
... ... @@ -2105,8 +2105,8 @@
2105 2105 if (skip >= n || skip < 0)
2106 2106 return 0;
2107 2107  
2108   - kmsg_dump_rewind(&dumper);
2109   - while (kmsg_dump_get_line(&dumper, 1, buf, sizeof(buf), &len)) {
  2108 + kmsg_dump_rewind_nolock(&dumper);
  2109 + while (kmsg_dump_get_line_nolock(&dumper, 1, buf, sizeof(buf), &len)) {
2110 2110 if (skip) {
2111 2111 skip--;
2112 2112 continue;