Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/mm: -Werror fixes in page-types/slabinfo

Browse Source 
Commit e6d2c436ff ("tools/mm: allow users to provide additional
cflags/ldflags") passes now CFLAGS to Makefile.  With this, build systems
with default -Werror enabled found:

slabinfo.c:1300:25: error: ignoring return value of 'chdir'
declared with attribute 'warn_unused_result' [-Werror=unused-result]
                         chdir("..");
                         ^~~~~~~~~~~
page-types.c:397:35: error: format '%lu' expects argument of type
'long unsigned int', but argument 2 has type 'uint64_t'
{aka 'long long unsigned int'} [-Werror=format=]
                         printf("%lu\t", mapcnt0);
                                 ~~^     ~~~~~~~
..

Fix page-types by using PRIu64 for uint64_t prints and check in slabinfo
for return code on chdir("..").

Link: https://lkml.kernel.org/r/c1ceb507-94bc-461c-934d-c19b77edd825@gmail.com
Fixes: e6d2c436ff ("tools/mm: allow users to provide additional cflags/ldflags")
Signed-off-by: Wladislav Wiebe <wladislav.kw@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Herton R. Krzesinski <herton@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Wladislav Wiebe 2024-10-22 19:21:13 +02:00 committed by Andrew Morton
parent 5168a68eb7
commit ece5897e5a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/mm/page-types.c
View File

@ -22,6 +22,7 @@
#include <time.h> #include <time.h>
#include <setjmp.h> #include <setjmp.h>
#include <signal.h> #include <signal.h>
#include <inttypes.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
@ -391,9 +392,9 @@ static void show_page_range(unsigned long voffset, unsigned long offset,
if (opt_file) if (opt_file)
printf("%lx\t", voff); printf("%lx\t", voff);
if (opt_list_cgroup) if (opt_list_cgroup)
printf("@%llu\t", (unsigned long long)cgroup0); printf("@%" PRIu64 "\t", cgroup0);
if (opt_list_mapcnt) if (opt_list_mapcnt)
printf("%lu\t", mapcnt0); printf("%" PRIu64 "\t", mapcnt0);
printf("%lx\t%lx\t%s\n", printf("%lx\t%lx\t%s\n",
index, count, page_flag_name(flags0)); index, count, page_flag_name(flags0));
} }
@ -419,9 +420,9 @@ static void show_page(unsigned long voffset, unsigned long offset,
if (opt_file) if (opt_file)
printf("%lx\t", voffset); printf("%lx\t", voffset);
if (opt_list_cgroup) if (opt_list_cgroup)
printf("@%llu\t", (unsigned long long)cgroup); printf("@%" PRIu64 "\t", cgroup)
if (opt_list_mapcnt) if (opt_list_mapcnt)
printf("%lu\t", mapcnt); printf("%" PRIu64 "\t", mapcnt);
printf("%lx\t%s\n", offset, page_flag_name(flags)); printf("%lx\t%s\n", offset, page_flag_name(flags));
} }

4
tools/mm/slabinfo.c
View File

@ -1297,7 +1297,9 @@ static void read_slab_dir(void)
slab->cpu_partial_free = get_obj("cpu_partial_free"); slab->cpu_partial_free = get_obj("cpu_partial_free");
slab->alloc_node_mismatch = get_obj("alloc_node_mismatch"); slab->alloc_node_mismatch = get_obj("alloc_node_mismatch");
slab->deactivate_bypass = get_obj("deactivate_bypass"); slab->deactivate_bypass = get_obj("deactivate_bypass");
chdir(".."); if (chdir(".."))
fatal("Unable to chdir from slab ../%s\n",
slab->name);
if (slab->name[0] == ':') if (slab->name[0] == ':')
alias_targets++; alias_targets++;
slab++; slab++;