diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-11-09 10:39:52 +0000 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2024-11-09 10:39:52 +0000 |
| commit | e459ca0aec9a38f71e35c83d3dcb3cadb5033334 (patch) | |
| tree | d66e23adf3d366d07d1d77f7f3fc3356808fa795 /lib/objpool.c | |
| parent | 56686ac80b859c2049cc372f7837470aa71c98cf (diff) | |
| parent | 9365f0de4303f82ed4c2db1c39d3de824b249d80 (diff) | |
Merge commit '9365f0de4303f82ed4c2db1c39d3de824b249d80' into HEAD
Merge v6.12-rc6 via char-misc-next to get some fixes needed for next few
patches in IIO.
Diffstat (limited to 'lib/objpool.c')
| -rw-r--r-- | lib/objpool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/objpool.c b/lib/objpool.c index 234f9d0bd081..fd108fe0d095 100644 --- a/lib/objpool.c +++ b/lib/objpool.c @@ -76,7 +76,7 @@ objpool_init_percpu_slots(struct objpool_head *pool, int nr_objs, * mimimal size of vmalloc is one page since vmalloc would * always align the requested size to page size */ - if (pool->gfp & GFP_ATOMIC) + if ((pool->gfp & GFP_ATOMIC) == GFP_ATOMIC) slot = kmalloc_node(size, pool->gfp, cpu_to_node(i)); else slot = __vmalloc_node(size, sizeof(void *), pool->gfp, |