summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-09-20 10:31:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-20 10:31:19 -0700
commit3207598ab00e0fb06c8d73c9ae567afa4847e70e (patch)
tree36f3b762fa2e2c13a9b68e26d41e1a6bd6a93054
parentb08918fb3f27d1843152986e6bc79ec723dba8cc (diff)
parentd8a050f5a3e8242242df6430d5980c142350e461 (diff)
downloadlinux-3207598ab00e0fb06c8d73c9ae567afa4847e70e.tar.bz2
Merge tag 'kgdb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux
Pull kgdb updates from Daniel Thompson: "It has been a quiet dev cycle for kgdb. There has been some good stuff for kdb on the mailing list but unfortunately the patches caused a couple of problems with the kdb pager so I had to drop those and they will have to wait for next time! That just leaves us with just a couple of very tiny clean ups for now: - Fix a broken comment - Use str_has_prefix() for the grep "pipe" in kdb" * tag 'kgdb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux: kgdb: fix comment regarding static function kdb: Replace strncmp with str_has_prefix
-rw-r--r--kernel/debug/debug_core.c5
-rw-r--r--kernel/debug/kdb/kdb_main.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index 5cc608de6883..10f1187b3907 100644
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -787,11 +787,8 @@ out:
}
/*
- * GDB places a breakpoint at this function to know dynamically
- * loaded objects. It's not defined static so that only one instance with this
- * name exists in the kernel.
+ * GDB places a breakpoint at this function to know dynamically loaded objects.
*/
-
static int module_event(struct notifier_block *self, unsigned long val,
void *data)
{
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 9ecfa37c7fbf..4567fe998c30 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -830,7 +830,7 @@ static void parse_grep(const char *str)
cp++;
while (isspace(*cp))
cp++;
- if (strncmp(cp, "grep ", 5)) {
+ if (!str_has_prefix(cp, "grep ")) {
kdb_printf("invalid 'pipe', see grephelp\n");
return;
}