diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-07-21 16:31:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-07-21 16:31:13 +1000 |
| commit | 43d1a8e000c2651686da00e5a81d32090e7ec8ed (patch) | |
| tree | c2d125ac28002bd9663d8133aed22db82e2d432a /mm/mmap_lock.c | |
| parent | b4e39e59e64e0cf011d0770798ffece3d6a76277 (diff) | |
| parent | ace6e27b90197751ad3e6baadae3b8b065fd4e2d (diff) | |
| download | linux-next-43d1a8e000c2651686da00e5a81d32090e7ec8ed.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'mm/mmap_lock.c')
| -rw-r--r-- | mm/mmap_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/mmap_lock.c b/mm/mmap_lock.c index f5852a058ce0..1854850b4b89 100644 --- a/mm/mmap_lock.c +++ b/mm/mmap_lock.c @@ -156,14 +156,14 @@ static inline void put_memcg_path_buf(void) #define TRACE_MMAP_LOCK_EVENT(type, mm, ...) \ do { \ const char *memcg_path; \ - preempt_disable(); \ + local_lock(&memcg_paths.lock); \ memcg_path = get_mm_memcg_path(mm); \ trace_mmap_lock_##type(mm, \ memcg_path != NULL ? memcg_path : "", \ ##__VA_ARGS__); \ if (likely(memcg_path != NULL)) \ put_memcg_path_buf(); \ - preempt_enable(); \ + local_unlock(&memcg_paths.lock); \ } while (0) #else /* !CONFIG_MEMCG */ |