tools-mm-werror-fixes-in-page-types-slabinfo.patch removed from -mm tree
The quilt patch titled
Subject: tools/mm: -Werror fixes in page-types/slabinfo
has been removed from the -mm tree. Its filename was
tools-mm-werror-fixes-in-page-types-slabinfo.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Wladislav Wiebe <[email protected]>
Subject: tools/mm: -Werror fixes in page-types/slabinfo
Date: Tue, 22 Oct 2024 19:21:13 +0200
Commit e6d2c436ff693 ("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("..").
---
tools/mm/page-types.c | 9 +++++---- tools/mm/slabinfo.c | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-)
tools/mm/page-types.c renamed from tools/mm/page-types.c~tools-mm-werror-fixes-in-page-types-slabinfo +5 -4
@@ -22,6 +22,7 @@#include <time.h> #include <setjmp.h> #include <signal.h> +#include <inttypes.h> #include <sys/types.h> #include <sys/errno.h> #include <sys/fcntl.h>
@@ -391,9 +392,9 @@ static void show_page_range(unsigned lonif (opt_file)printf ("%lx\t" , voff);if (opt_list_cgroup) -printf ("@%llu\t" , (unsigned long long )cgroup0); +printf ("@%" PRIu64"\t" , cgroup0);if (opt_list_mapcnt) -printf ("%lu\t" , mapcnt0); +printf ("%" PRIu64"\t" , mapcnt0);printf ("%lx\t%lx\t%s\n" , index, count,page_flag_name (flags0)); }
@@ -419,9 +420,9 @@ static void show_page(unsigned long voffif (opt_file)printf ("%lx\t" , voffset);if (opt_list_cgroup) -printf ("@%llu\t" , (unsigned long long )cgroup); + printf("@%" PRIu64 "\t", cgroup)if (opt_list_mapcnt) -printf ("%lu\t" , mapcnt); +printf ("%" PRIu64"\t" , mapcnt);printf ("%lx\t%s\n" , offset,page_flag_name (flags)); }
tools/mm/slabinfo.c renamed from tools/mm/slabinfo.c~tools-mm-werror-fixes-in-page-types-slabinfo +3 -1
@@ -1297,7 +1297,9 @@ static void read_slab_dir(void) slab->cpu_partial_free =get_obj ("cpu_partial_free" ); slab->alloc_node_mismatch =get_obj ("alloc_node_mismatch" ); slab->deactivate_bypass =get_obj ("deactivate_bypass" ); -chdir (".." ); +if (chdir (".." )) +fatal ("Unable to chdir from slab ../%s\n" , + slab->name);if (slab->name[0 ] ==':' ) alias_targets++; slab++;
_
Patches currently in -mm which might be from [email protected] are