diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-02-20 10:36:34 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-02-20 10:37:30 -0800 |
| commit | 5d6ba5ab8582aa35c1ee98e47af28e6f6772596c (patch) | |
| tree | a4a3a2d311773c19909c9928273e0bcae01a39ce /mm/memcontrol.c | |
| parent | 384cba25b886a06c9970189bfa50b7b03a57be65 (diff) | |
| parent | 27eddbf3449026a73d6ed52d55b192bfcf526a03 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc4).
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 46f8b372d212..4de6acb9b8ec 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4166,6 +4166,7 @@ static ssize_t memory_max_write(struct kernfs_open_file *of, memcg_memory_event(memcg, MEMCG_OOM); if (!mem_cgroup_out_of_memory(memcg, GFP_KERNEL, 0)) break; + cond_resched(); } memcg_wb_domain_size_changed(memcg); |