[tip:,core/rcu] mm/pagemap: Cleanup PREEMPT_COUNT leftovers
diff mbox series

Message ID 160226288705.7002.3287677624087065789.tip-bot2@tip-bot2
State In Next
Commit 3fc8bf8534f912b62ec3cd3347790551729b80fb
Headers show
Series
  • [tip:,core/rcu] mm/pagemap: Cleanup PREEMPT_COUNT leftovers
Related show

Commit Message

tip-bot2 for Juergen Gross Oct. 9, 2020, 5:01 p.m. UTC 
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 <tglx@linutronix.de>
AuthorDate:    Mon, 14 Sep 2020 19:25:00 +02:00
Committer:     Paul E. McKenney <paulmck@kernel.org>
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 <tglx@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
[ paulmck: Fix !SMP build error per kernel test robot feedback. ]
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
 include/linux/pagemap.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch
diff mbox series 

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.