diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-03-04 07:24:37 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-03-04 07:25:12 -0500 |
| commit | 2c8fedbbbb8266b792c1bfec0dbcbed77d61fa8d (patch) | |
| tree | ddd97d859c2b7440f5a69f219d553adf814d20b8 /tools/lib | |
| parent | 0c87214ec2d8da6478321a9e5b4c1e1f81fbf861 (diff) | |
| parent | 6258e292d7463f96d0f06dff2a39093a54c9d16f (diff) | |
Merge v6.18.16
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/perf/Makefile | 2 | ||||
| -rw-r--r-- | tools/lib/subcmd/help.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/lib/perf/Makefile b/tools/lib/perf/Makefile index 7fbb50b74c00..5c64122bf537 100644 --- a/tools/lib/perf/Makefile +++ b/tools/lib/perf/Makefile @@ -51,9 +51,9 @@ INCLUDES = \ -I$(srctree)/tools/include/uapi # Append required CFLAGS +override CFLAGS := $(INCLUDES) $(CFLAGS) override CFLAGS += -g -Werror -Wall override CFLAGS += -fPIC -override CFLAGS += $(INCLUDES) override CFLAGS += -fvisibility=hidden override CFLAGS += $(EXTRA_WARNINGS) override CFLAGS += $(EXTRA_CFLAGS) diff --git a/tools/lib/subcmd/help.c b/tools/lib/subcmd/help.c index ddaeb4eb3e24..db94aa685b73 100644 --- a/tools/lib/subcmd/help.c +++ b/tools/lib/subcmd/help.c @@ -97,11 +97,13 @@ void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes) ei++; } } - if (ci != cj) { - while (ci < cmds->cnt) { - cmds->names[cj++] = cmds->names[ci]; - cmds->names[ci++] = NULL; + while (ci < cmds->cnt) { + if (ci != cj) { + cmds->names[cj] = cmds->names[ci]; + cmds->names[ci] = NULL; } + ci++; + cj++; } for (ci = cj; ci < cmds->cnt; ci++) assert(cmds->names[ci] == NULL); |