| From ffbe1c01ae8f21570fda58a2de1c9299fcbae794 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 13 Nov 2024 15:48:22 +0100 |
| Subject: tools/power turbostat: Fix child's argument forwarding |
| |
| From: Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com> |
| |
| [ Upstream commit 1da0daf746342dfdc114e4dc8fbf3ece28666d4f ] |
| |
| Add '+' to optstring when early scanning for --no-msr and --no-perf. |
| It causes option processing to stop as soon as a nonoption argument is |
| encountered, effectively skipping child's arguments. |
| |
| Fixes: 3e4048466c39 ("tools/power turbostat: Add --no-msr option") |
| Signed-off-by: Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com> |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/power/x86/turbostat/turbostat.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c |
| index aa9200319d0ea..a5ebee8b23bbe 100644 |
| --- a/tools/power/x86/turbostat/turbostat.c |
| +++ b/tools/power/x86/turbostat/turbostat.c |
| @@ -9784,7 +9784,7 @@ void cmdline(int argc, char **argv) |
| * Parse some options early, because they may make other options invalid, |
| * like adding the MSR counter with --add and at the same time using --no-msr. |
| */ |
| - while ((opt = getopt_long_only(argc, argv, "MPn:", long_options, &option_index)) != -1) { |
| + while ((opt = getopt_long_only(argc, argv, "+MPn:", long_options, &option_index)) != -1) { |
| switch (opt) { |
| case 'M': |
| no_msr = 1; |
| -- |
| 2.43.0 |
| |
