diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-07 09:19:06 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-13 11:01:34 -0500 |
| commit | 147cbd2ed17550efd0863419f468d03c193216b0 (patch) | |
| tree | 6b295744a6866a6da976fd59f4003c97d4034a62 | |
| parent | 16dd34d2ace872acac3c93a9b8b6f5f916a30007 (diff) | |
sched-might-sleep-do-not-account-rcu-depth.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/linux/rcupdate.h | 7 | ||||
| -rw-r--r-- | kernel/sched/core.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 20fb776a1d4a..23a500f70fcf 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -156,6 +156,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 */ @@ -179,6 +184,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/core.c b/kernel/sched/core.c index f3998c4294c2..d08d0a0d623c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7082,7 +7082,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); } |