Merge tag 'for_linus-4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb

Pull kgdb fixes from Jason Wessel:

 - Fix long standing problem with kdb kallsyms_symbol_next() return
   value

 - Add new co-maintainer Daniel Thompson

* tag 'for_linus-4.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  kgdb/kdb/debug_core: Add co-maintainer Daniel Thompson
  kdb: Fix handling of kallsyms_symbol_next() return value

2 files changed, 2 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 64c1ceaef4be..85773bf90b0a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7767,6 +7767,7 @@ F:	security/keys/
 
 KGDB / KDB /debug_core
 M:      Jason Wessel <jason.wessel@windriver.com>
+M:      Daniel Thompson <daniel.thompson@linaro.org>
 W:      http://kgdb.wiki.kernel.org/
 L:      kgdb-bugreport@lists.sourceforge.net
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
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:
                         }
                         kdb_printf("\n");
                         for (i = 0; i < count; i++) {
-                                if (kallsyms_symbol_next(p_tmp, i) < 0)
+                                if (WARN_ON(!kallsyms_symbol_next(p_tmp, i)))
                                         break;
                                 kdb_printf("%s ", p_tmp);
                                 *(p_tmp + len) = '\0';