diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-12-11 09:43:15 -0500 |
---|---|---|
committer | Jason Wessel <jason.wessel@windriver.com> | 2009-12-11 09:43:15 -0500 |
commit | 59d309f9c8ef0bd01bf93cc0e758f1d810417bdb (patch) | |
tree | 7f6fd4135a6761350c5332db908122f1de180ad4 | |
parent | b4f1b67be99d6eda8f2f252460905858ace871ef (diff) |
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: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-rw-r--r-- | drivers/misc/kgdbts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index 2ab04923d70f..fcb6ec1af173 100644 --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c | |||
@@ -891,16 +891,16 @@ static void kgdbts_run_tests(void) | |||
891 | int nmi_sleep = 0; | 891 | int nmi_sleep = 0; |
892 | int i; | 892 | int i; |
893 | 893 | ||
894 | ptr = strstr(config, "F"); | 894 | ptr = strchr(config, 'F'); |
895 | if (ptr) | 895 | if (ptr) |
896 | fork_test = simple_strtol(ptr + 1, NULL, 10); | 896 | fork_test = simple_strtol(ptr + 1, NULL, 10); |
897 | ptr = strstr(config, "S"); | 897 | ptr = strchr(config, 'S'); |
898 | if (ptr) | 898 | if (ptr) |
899 | do_sys_open_test = simple_strtol(ptr + 1, NULL, 10); | 899 | do_sys_open_test = simple_strtol(ptr + 1, NULL, 10); |
900 | ptr = strstr(config, "N"); | 900 | ptr = strchr(config, 'N'); |
901 | if (ptr) | 901 | if (ptr) |
902 | nmi_sleep = simple_strtol(ptr+1, NULL, 10); | 902 | nmi_sleep = simple_strtol(ptr+1, NULL, 10); |
903 | ptr = strstr(config, "I"); | 903 | ptr = strchr(config, 'I'); |
904 | if (ptr) | 904 | if (ptr) |
905 | sstep_test = simple_strtol(ptr+1, NULL, 10); | 905 | sstep_test = simple_strtol(ptr+1, NULL, 10); |
906 | 906 | ||