51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From f9ccbe24423f5be1be9ab454a999a084e4fd552b Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Tue, 7 Jun 2011 09:19:06 +0200
|
|
Subject: [PATCH 147/290] sched-might-sleep-do-not-account-rcu-depth.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
include/linux/rcupdate.h | 7 +++++++
|
|
kernel/sched.c | 3 ++-
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
|
|
index 2cf4226..a0082e2 100644
|
|
--- a/include/linux/rcupdate.h
|
|
+++ b/include/linux/rcupdate.h
|
|
@@ -147,6 +147,11 @@ void synchronize_rcu(void);
|
|
* types of kernel builds, the rcu_read_lock() nesting depth is unknowable.
|
|
*/
|
|
#define rcu_preempt_depth() (current->rcu_read_lock_nesting)
|
|
+#ifndef CONFIG_PREEMPT_RT_FULL
|
|
+#define sched_rcu_preempt_depth() rcu_preempt_depth()
|
|
+#else
|
|
+static inline int sched_rcu_preempt_depth(void) { return 0; }
|
|
+#endif
|
|
|
|
#else /* #ifdef CONFIG_PREEMPT_RCU */
|
|
|
|
@@ -170,6 +175,8 @@ static inline int rcu_preempt_depth(void)
|
|
return 0;
|
|
}
|
|
|
|
+#define sched_rcu_preempt_depth() rcu_preempt_depth()
|
|
+
|
|
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
|
|
|
|
/* Internal to kernel */
|
|
diff --git a/kernel/sched.c b/kernel/sched.c
|
|
index b16b7e4..afc9d85 100644
|
|
--- a/kernel/sched.c
|
|
+++ b/kernel/sched.c
|
|
@@ -8660,7 +8660,8 @@ void __init sched_init(void)
|
|
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
|
|
static inline int preempt_count_equals(int preempt_offset)
|
|
{
|
|
- int nested = (preempt_count() & ~PREEMPT_ACTIVE) + rcu_preempt_depth();
|
|
+ int nested = (preempt_count() & ~PREEMPT_ACTIVE) +
|
|
+ sched_rcu_preempt_depth();
|
|
|
|
return (nested == preempt_offset);
|
|
}
|