Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 968edbd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ba3edf1f 4e23f78c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -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

kernel/debug/kdb/kdb_io.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static char *kdb_read(char *buffer, size_t bufsize) 
			}

			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';