diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-12-11 08:43:15 -0600 |
|---|---|---|
| committer | Jason Wessel <jason.wessel@windriver.com> | 2009-12-11 08:43:15 -0600 |
| commit | 59d309f9c8ef0bd01bf93cc0e758f1d810417bdb (patch) | |
| tree | 7f6fd4135a6761350c5332db908122f1de180ad4 /drivers/misc | |
| parent | b4f1b67be99d6eda8f2f252460905858ace871ef (diff) | |
| download | linux-stable-59d309f9c8ef0bd01bf93cc0e758f1d810417bdb.tar.gz linux-stable-59d309f9c8ef0bd01bf93cc0e758f1d810417bdb.tar.bz2 linux-stable-59d309f9c8ef0bd01bf93cc0e758f1d810417bdb.zip | |
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>
Diffstat (limited to 'drivers/misc')
| -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) 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); |