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

Message ID 160226288603.7002.7165906935528714563.tip-bot2@tip-bot2
State In Next
Commit 7cd5f4baf8080d5647f6b282fdbc64be94251b1e
Headers show
Series
  • [tip:,core/rcu] uaccess: Cleanup PREEMPT_COUNT leftovers
Related show

Commit Message

tip-bot2 for Peter Zijlstra Oct. 9, 2020, 5:01 p.m. UTC
The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     53eed709fcb488787aca3f94796d82775c8e9669
Gitweb:        https://git.kernel.org/tip/53eed709fcb488787aca3f94796d82775c8e9669
Author:        Thomas Gleixner <tglx@linutronix.de>
AuthorDate:    Mon, 14 Sep 2020 19:29:06 +02:00
Committer:     Paul E. McKenney <paulmck@kernel.org>
CommitterDate: Mon, 28 Sep 2020 16:03:20 -07:00

uaccess: 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>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
 include/linux/uaccess.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch
diff mbox series

diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index 94b2854..b79a5a9 100644
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -230,9 +230,9 @@  static inline bool pagefault_disabled(void)
  *
  * This function should only be used by the fault handlers. Other users should
  * stick to pagefault_disabled().
- * Please NEVER use preempt_disable() to disable the fault handler. With
- * !CONFIG_PREEMPT_COUNT, this is like a NOP. So the handler won't be disabled.
- * in_atomic() will report different values based on !CONFIG_PREEMPT_COUNT.
+ *
+ * Please NEVER use preempt_disable() or local_irq_disable() to disable the
+ * fault handler.
  */
 #define faulthandler_disabled() (pagefault_disabled() || in_atomic())