diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-20 13:06:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-20 13:06:52 +0200 |
| commit | 967535223f9a8d95c187a8728480b569164cd4f4 (patch) | |
| tree | b68a403701555a747b25c903d8136d86a1a1c133 /mm/slab.h | |
| parent | 5b65c4677a57a1d4414212f9995aa0e46a21ff80 (diff) | |
| parent | ce56a86e2ade45d052b3228cdfebe913a1ae7381 (diff) | |
Merge branch 'x86/urgent' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/slab.h')
| -rw-r--r-- | mm/slab.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/slab.h b/mm/slab.h index 6885e1192ec5..073362816acc 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -43,6 +43,7 @@ struct kmem_cache { #include <linux/kasan.h> #include <linux/kmemleak.h> #include <linux/random.h> +#include <linux/sched/mm.h> /* * State of the slab allocator. @@ -412,7 +413,10 @@ static inline struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s, gfp_t flags) { flags &= gfp_allowed_mask; - lockdep_trace_alloc(flags); + + fs_reclaim_acquire(flags); + fs_reclaim_release(flags); + might_sleep_if(gfpflags_allow_blocking(flags)); if (should_failslab(s, flags)) |