diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-04-11 15:31:43 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-04-11 15:31:43 +0300 |
| commit | 120b566d1df22a0a4543ac0e8aef875c49dd2c21 (patch) | |
| tree | b13547dadf5cd29cae5341629771192be8db4a28 /mm/slab.c | |
| parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
| parent | ab6ad3dbddaf09f7df2d830766a2fb68d6ad669f (diff) | |
| download | linux-120b566d1df22a0a4543ac0e8aef875c49dd2c21.tar.xz | |
Merge branch 'for-mingo-rcu' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU changes from Paul E. McKenney:
- Bitmap support for "N" as alias for last bit
- kvfree_rcu updates
- mm_dump_obj() updates. (One of these is to mm, but was suggested by Andrew Morton.)
- RCU callback offloading update
- Polling RCU grace-period interfaces
- Realtime-related RCU updates
- Tasks-RCU updates
- Torture-test updates
- Torture-test scripting updates
- Miscellaneous fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/slab.c b/mm/slab.c index ae651bf540b7..4e212cda8693 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3651,6 +3651,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t flags, EXPORT_SYMBOL(__kmalloc_node_track_caller); #endif /* CONFIG_NUMA */ +#ifdef CONFIG_PRINTK void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct page *page) { struct kmem_cache *cachep; @@ -3670,6 +3671,7 @@ void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct page *page) if (DEBUG && cachep->flags & SLAB_STORE_USER) kpp->kp_ret = *dbg_userword(cachep, objp); } +#endif /** * __do_kmalloc - allocate memory |