From 262e548a84bbdf0a4ad362ff27d83066e5c3e5b3 Mon Sep 17 00:00:00 2001 From: Alexander Fougner Date: Thu, 7 Dec 2023 21:04:27 +0100 Subject: [PATCH 1/2] fix fallback flex array Signed-off-by: Alexander Fougner --- include/linux/kernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index da01c381..6315e53a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -281,7 +281,7 @@ static inline void dump_stack(void) {} #ifdef __DECLARE_FLEX_ARRAY #define DECLARE_FLEX_ARRAY(TYPE, NAME) __DECLARE_FLEX_ARRAY(TYPE, NAME) #else -#define __DECLARE_FLEX_ARRAY(T, member) T member[0] +#define DECLARE_FLEX_ARRAY(T, member) T member[0] #endif #endif From 244046945aa2e256a8702ceba50608028f58be43 Mon Sep 17 00:00:00 2001 From: Alexander Fougner Date: Thu, 7 Dec 2023 21:27:16 +0100 Subject: [PATCH 2/2] fix build for glibc prior to 2.33 Signed-off-by: Alexander Fougner --- linux/shrinker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/shrinker.c b/linux/shrinker.c index 361196ac..91f633b5 100644 --- a/linux/shrinker.c +++ b/linux/shrinker.c @@ -69,7 +69,7 @@ void run_shrinkers(gfp_t gfp_mask, bool allocation_failed) { struct shrinker *shrinker; struct sysinfo info; - struct mallinfo2 malloc_info = mallinfo2(); + struct mallinfo malloc_info = mallinfo(); s64 want_shrink; if (!(gfp_mask & GFP_KERNEL))