alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'amoz/devel'

Browse Source
This commit is contained in:
Kent Overstreet 2023-12-07 20:19:06 -05:00
commit e3e7f67b3e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/kernel.h
View File

@ -281,7 +281,7 @@ static inline void dump_stack(void) {}
#ifdef __DECLARE_FLEX_ARRAY #ifdef __DECLARE_FLEX_ARRAY
#define DECLARE_FLEX_ARRAY(TYPE, NAME) __DECLARE_FLEX_ARRAY(TYPE, NAME) #define DECLARE_FLEX_ARRAY(TYPE, NAME) __DECLARE_FLEX_ARRAY(TYPE, NAME)
#else #else
#define __DECLARE_FLEX_ARRAY(T, member) T member[0] #define DECLARE_FLEX_ARRAY(T, member) T member[0]
#endif #endif
#endif #endif

2
linux/shrinker.c
View File

@ -69,7 +69,7 @@ void run_shrinkers(gfp_t gfp_mask, bool allocation_failed)
{ {
struct shrinker *shrinker; struct shrinker *shrinker;
struct sysinfo info; struct sysinfo info;
struct mallinfo2 malloc_info = mallinfo2(); struct mallinfo malloc_info = mallinfo();
s64 want_shrink; s64 want_shrink;
if (!(gfp_mask & GFP_KERNEL)) if (!(gfp_mask & GFP_KERNEL))