diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-07 20:19:06 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-12-07 20:19:06 -0500 |
| commit | e3e7f67b3ed89f5b3158142c29e66bb98f868ce2 (patch) | |
| tree | 9291a15f853d264e5c04d7364ef6b3270d164125 | |
| parent | 36898f574b4053f0c0552c8a60bc1c5d6d22f295 (diff) | |
| parent | 244046945aa2e256a8702ceba50608028f58be43 (diff) | |
Merge remote-tracking branch 'amoz/devel'
| -rw-r--r-- | include/linux/kernel.h | 2 | ||||
| -rw-r--r-- | linux/shrinker.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 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)) |