From: Simon Glass <simon.glass@canonical.com> Move the memory allocation flags to include/linux/slab.h with other GFP flags, matching Linux kernel organisation. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- fs/ext4l/ext4_uboot.h | 5 +---- include/linux/slab.h | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/ext4l/ext4_uboot.h b/fs/ext4l/ext4_uboot.h index 931889f6046..b35559b8b18 100644 --- a/fs/ext4l/ext4_uboot.h +++ b/fs/ext4l/ext4_uboot.h @@ -126,10 +126,7 @@ #define data_race(expr) (expr) /* REQ_META, REQ_PRIO, REQ_RAHEAD are in linux/blk_types.h */ - -/* GFP flags - stubs */ -#define __GFP_MOVABLE 0 -#define __GFP_FS 0 +/* __GFP_MOVABLE, __GFP_FS are in linux/slab.h */ /* Capabilities - use linux/capability.h */ #include <linux/capability.h> diff --git a/include/linux/slab.h b/include/linux/slab.h index 1b212ca0e4a..fb809063593 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -42,6 +42,12 @@ #ifndef __GFP_NOFAIL #define __GFP_NOFAIL ((gfp_t)0) #endif +#ifndef __GFP_MOVABLE +#define __GFP_MOVABLE ((gfp_t)0) +#endif +#ifndef __GFP_FS +#define __GFP_FS ((gfp_t)0) +#endif #ifndef GFP_NOIO #define GFP_NOIO ((gfp_t)0) #endif -- 2.43.0