diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2026-08-24 18:40:27 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2026-08-24 18:40:27 -0700 |
| commit | 4b47e81e5657ea0d9c157399b366776a042ac8d8 (patch) | |
| tree | f6fd26fa6663e754184fd283bf775d725a95cbb6 /include/linux | |
| parent | 08745c62350126bc31b09548137be87e2866f628 (diff) | |
| parent | aedf2efd18977e0cef7eb963166e2b1fcc0aa321 (diff) | |
Merge branch 'mm-hotfixes-stable' into mm-stable to pick up
already-upstream changes to memcontrol.c, needed by "memcg: move
mem_cgroup_swappiness and vm_swappiness to mm/swap.h".
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmap_lock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmap_lock.h b/include/linux/mmap_lock.h index d513286d8160..bec0eab6ef03 100644 --- a/include/linux/mmap_lock.h +++ b/include/linux/mmap_lock.h @@ -629,6 +629,7 @@ static inline void mmap_read_unlock(struct mm_struct *mm) DEFINE_GUARD(mmap_read_lock, struct mm_struct *, mmap_read_lock(_T), mmap_read_unlock(_T)) +DEFINE_GUARD_COND(mmap_read_lock, _try, mmap_read_trylock(_T)) static inline void mmap_read_unlock_non_owner(struct mm_struct *mm) { |