Skip to content

Commit

Permalink
kgdb: Replace strstr() by strchr() for single-character needles
Browse files Browse the repository at this point in the history
Some versions of gcc replace calls to strstr() with single-character
"needle" string parameters by calls to strchr() behind our back.
This causes linking errors if strchr() is defined as an inline function
in <asm/string.h> (e.g. on m68k, which BTW doesn't have kgdb support).

Prevent this by explicitly calling strchr() instead.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  • Loading branch information
Geert Uytterhoeven authored and Jason Wessel committed Dec 11, 2009
1 parent b4f1b67 commit 59d309f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/misc/kgdbts.c
Original file line number Diff line number Diff line change
Expand Up @@ -891,16 +891,16 @@ static void kgdbts_run_tests(void)
int nmi_sleep = 0;
int i;

ptr = strstr(config, "F");
ptr = strchr(config, 'F');
if (ptr)
fork_test = simple_strtol(ptr + 1, NULL, 10);
ptr = strstr(config, "S");
ptr = strchr(config, 'S');
if (ptr)
do_sys_open_test = simple_strtol(ptr + 1, NULL, 10);
ptr = strstr(config, "N");
ptr = strchr(config, 'N');
if (ptr)
nmi_sleep = simple_strtol(ptr+1, NULL, 10);
ptr = strstr(config, "I");
ptr = strchr(config, 'I');
if (ptr)
sstep_test = simple_strtol(ptr+1, NULL, 10);

Expand Down

0 comments on commit 59d309f

Please sign in to comment.