The following commit has been merged into the core/rcu branch of tip: Commit-ID: 1aba898d50dd0dc18d418bf66b2eea0028b2fbd6 Gitweb: https://git.kernel.org/tip/1aba898d50dd0dc18d418bf66b2eea0028b2fbd6 Author: Thomas Gleixner <[email protected]> AuthorDate: Mon, 14 Sep 2020 19:25:00 +02:00 Committer: Paul E. McKenney <[email protected]> CommitterDate: Mon, 28 Sep 2020 16:03:19 -07:00
mm/pagemap: Cleanup PREEMPT_COUNT leftovers CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be removed. Cleanup the leftovers before doing so. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Andrew Morton <[email protected]> Cc: [email protected] [ paulmck: Fix !SMP build error per kernel test robot feedback. ] Signed-off-by: Paul E. McKenney <[email protected]> --- include/linux/pagemap.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 7de11dc..b3d9d92 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -168,9 +168,7 @@ void release_pages(struct page **pages, int nr); static inline int __page_cache_add_speculative(struct page *page, int count) { #ifdef CONFIG_TINY_RCU -# ifdef CONFIG_PREEMPT_COUNT - VM_BUG_ON(!in_atomic() && !irqs_disabled()); -# endif + VM_BUG_ON(preemptible()); /* * Preempt must be disabled here - we rely on rcu_read_lock doing * this for us.
