diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-05 14:08:14 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2023-09-05 14:08:14 -0700 |
| commit | 34069d12e239ae8f36dd96c378e4622fb1c42a76 (patch) | |
| tree | b33fabf1a4cc7530e93ab416f3156bdfe601a3a0 /include/linux/gfp.h | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
| parent | 2dde18cd1d8fac735875f2e4987f11817cc0bc2c (diff) | |
| download | linux-next-34069d12e239ae8f36dd96c378e4622fb1c42a76.tar.gz linux-next-34069d12e239ae8f36dd96c378e4622fb1c42a76.zip | |
Merge tag 'v6.5' into next
Sync up with mainline to bring in updates to the shared infrastructure.
Diffstat (limited to 'include/linux/gfp.h')
| -rw-r--r-- | include/linux/gfp.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index ed8cb537c6a7..665f06675c83 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -338,19 +338,12 @@ extern gfp_t gfp_allowed_mask; /* Returns true if the gfp_mask allows use of ALLOC_NO_WATERMARK */ bool gfp_pfmemalloc_allowed(gfp_t gfp_mask); -extern void pm_restrict_gfp_mask(void); -extern void pm_restore_gfp_mask(void); - -extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma); - -#ifdef CONFIG_PM_SLEEP -extern bool pm_suspended_storage(void); -#else -static inline bool pm_suspended_storage(void) +static inline bool gfp_has_io_fs(gfp_t gfp) { - return false; + return (gfp & (__GFP_IO | __GFP_FS)) == (__GFP_IO | __GFP_FS); } -#endif /* CONFIG_PM_SLEEP */ + +extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma); #ifdef CONFIG_CONTIG_ALLOC /* The below functions must be run on a range from a single zone. */ |