summaryrefslogtreecommitdiff
path: root/lib/xarray.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2025-10-14 10:37:11 +0300
committerJani Nikula <jani.nikula@intel.com>2025-10-14 10:37:11 +0300
commit2acee98fcc61052d63fab4539fcb6ee677555645 (patch)
tree7809a2a2d02620d825a70123947246508bd90078 /lib/xarray.c
parenta051ef9f12f5b15857b54d6d68f1f525959c7ad9 (diff)
parent3a8660878839faadb4f1a6dd72c3179c1df56787 (diff)
downloadlinux-2acee98fcc61052d63fab4539fcb6ee677555645.tar.xz
Merge drm/drm-next into drm-intel-next
Sync to v6.18-rc1. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'lib/xarray.c')
-rw-r--r--lib/xarray.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/xarray.c b/lib/xarray.c
index ae3d80f4b4ee..9a8b4916540c 100644
--- a/lib/xarray.c
+++ b/lib/xarray.c
@@ -370,7 +370,7 @@ static void *xas_alloc(struct xa_state *xas, unsigned int shift)
if (node) {
xas->xa_alloc = NULL;
} else {
- gfp_t gfp = GFP_NOWAIT | __GFP_NOWARN;
+ gfp_t gfp = GFP_NOWAIT;
if (xas->xa->xa_flags & XA_FLAGS_ACCOUNT)
gfp |= __GFP_ACCOUNT;