kgdb: Replace strstr() by strchr() for single-character needles
Subsystems (2)
PATCH 1/1 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.
---
This is the single remaining case where strstr() is used with a single-character needle. Cfr.
commit 0d03d59d9b31cd1e33b7e46a80b6fef66244b1f2 ("md: Fix "strchr" [drivers/md/dm-log-userspace.ko] undefined!")
commit d8b0fb51ef1563c631d26cb649a5479b5cc4899c ("[PATCH] libertas link error due to gcc `smartness'")
drivers/misc/kgdbts.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/misc/kgdbts.c +4 -4
@@ -885,16 +885,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 );
Signature · 12 lines
1.6.0.4
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsJason Wessel
maintainerI think the patch is fine and I will accept it into the kgdb tree for pushing to Linus, but I did have a question.
How did the kgdbts.o end up getting compiled on m68k if there is no kgdb support on m68k?
CONFIG_KGDB_TESTS should not be able to be set if there is no CONFIG_KGDB set.
Thanks,
Jason.
Quoted 45 lines · Geert Uytterhoeven
Some versions of gcc replace calls to
strstr()with single-character "needle" string parameters by calls tostrchr()behind our back. This causes linking errors ifstrchr()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 <[email protected]>---
This is the single remaining case wherestrstr()is used with a single-character needle. Cfr.
commit0d03d59d9b31cd1e33b7e46a80b6fef66244b1f2("md: Fix "strchr" [drivers/md/dm-log-userspace.ko] undefined!")
commitd8b0fb51ef1563c631d26cb649a5479b5cc4899c("[PATCH] libertas link error due to gcc `smartness'")drivers/misc/kgdbts.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)drivers/misc/kgdbts.c +4
-4@@ -885,16 +885,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 );
Quoted 5 lines · Jason Wessel
I think the patch is fine and I will accept it into the kgdb tree for pushing to Linus, but I did have a question.
How did the kgdbts.o end up getting compiled on m68k if there is no kgdb support on m68k?
It didn't. I was just grepping for the problematic strstr() case.
Quoted 8 lines
Quoted 7 lines · Geert Uytterhoeven
Some versions of gcc replace calls to
strstr()with single-character "needle" string parameters by calls tostrchr()behind our back. This causes linking errors ifstrchr()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.
Quoted 8 lines
Quoted 8 lines
Signed-off-by Geert Uytterhoeven <[email protected]>---
This is the single remaining case wherestrstr()is used with a single-character needle. Cfr.
commit0d03d59d9b31cd1e33b7e46a80b6fef66244b1f2("md: Fix "strchr" [drivers/md/dm-log-userspace.ko] undefined!")
commitd8b0fb51ef1563c631d26cb649a5479b5cc4899c("[PATCH] libertas link error due to gcc `smartness'")
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds