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

Commit 59d309f9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jason Wessel
Browse files

kgdb: Replace strstr() by strchr() for single-character needles 



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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
parent b4f1b67b

drivers/misc/kgdbts.c

+4 −4
Original line number Diff line number Diff line
@@ -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);