summaryrefslogtreecommitdiff
path: root/patches/sched-might-sleep-do-not-account-rcu-depth.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/sched-might-sleep-do-not-account-rcu-depth.patch')
-rw-r--r--patches/sched-might-sleep-do-not-account-rcu-depth.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/sched-might-sleep-do-not-account-rcu-depth.patch b/patches/sched-might-sleep-do-not-account-rcu-depth.patch
index 1378bd3ba12c..ae58e0520646 100644
--- a/patches/sched-might-sleep-do-not-account-rcu-depth.patch
+++ b/patches/sched-might-sleep-do-not-account-rcu-depth.patch
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
-@@ -74,6 +74,11 @@ void synchronize_rcu(void);
+@@ -73,6 +73,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)
@@ -25,7 +25,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
#else /* #ifdef CONFIG_PREEMPT_RCU */
-@@ -99,6 +104,8 @@ static inline int rcu_preempt_depth(void
+@@ -98,6 +103,8 @@ static inline int rcu_preempt_depth(void
return 0;
}
@@ -36,7 +36,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
/* Internal to kernel */
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -6182,7 +6182,7 @@ void __init sched_init(void)
+@@ -6149,7 +6149,7 @@ void __init sched_init(void)
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
static inline int preempt_count_equals(int preempt_offset)
{