diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:15:26 +0100 |
| commit | 1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2 (patch) | |
| tree | 735b11a744d0acd18a1d7b7a4a5fa63fc6d23b92 /mm/memcontrol.c | |
| parent | d0ba9bcf001c7907e4755b0e498f5ff9d1a228ef (diff) | |
| parent | f6bdaab79ee4228a143ee1b4cb80416d6ffc0c63 (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@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); |