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 /include/linux/mm.h | |
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 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 8ba434287387..1c52d8f35d3d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3168,7 +3168,11 @@ unsigned long wp_shared_mapping_range(struct address_space *mapping, extern int sysctl_nr_trim_pages; +#ifdef CONFIG_PRINTK void mem_dump_obj(void *object); +#else +static inline void mem_dump_obj(void *object) {} +#endif #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ |