diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 02:50:05 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 02:50:05 -0500 |
| commit | 73cf7e111ed69d8e1b59a3ae41b14bc77215e9ee (patch) | |
| tree | 02cd3308d328bce9cf97bf2c1c9d5e932103ebfe /kernel/debug/kdb/kdb_io.c | |
| parent | 328257099077e8affd438c179d8a938948de2e7f (diff) | |
| parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) | |
Merge 4.15-rc3 into driver-core-next
We want the fixes and changes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/debug/kdb/kdb_io.c')
| -rw-r--r-- | kernel/debug/kdb/kdb_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c index e74be38245ad..ed5d34925ad0 100644 --- a/kernel/debug/kdb/kdb_io.c +++ b/kernel/debug/kdb/kdb_io.c | |||
| @@ -350,7 +350,7 @@ poll_again: | |||
| 350 | } | 350 | } |
| 351 | kdb_printf("\n"); | 351 | kdb_printf("\n"); |
| 352 | for (i = 0; i < count; i++) { | 352 | for (i = 0; i < count; i++) { |
| 353 | if (kallsyms_symbol_next(p_tmp, i) < 0) | 353 | if (WARN_ON(!kallsyms_symbol_next(p_tmp, i))) |
| 354 | break; | 354 | break; |
| 355 | kdb_printf("%s ", p_tmp); | 355 | kdb_printf("%s ", p_tmp); |
| 356 | *(p_tmp + len) = '\0'; | 356 | *(p_tmp + len) = '\0'; |
