summaryrefslogtreecommitdiff
path: root/patches/sched-might-sleep-do-not-account-rcu-depth.patch
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2017-06-16 12:33:25 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2017-06-16 12:33:25 +0200
commit62225af26cb9575945c764c73d73be4360532ec5 (patch)
tree9b320f25074befa6ece5d5887287219fe204e74f /patches/sched-might-sleep-do-not-account-rcu-depth.patch
parente435c24ff8bc5e5ba909c337419b0bcd9e61de55 (diff)
downloadlinux-rt-62225af26cb9575945c764c73d73be4360532ec5.tar.gz
[ANNOUNCE] v4.11.5-rt1v4.11.5-rt1-patches
Dear RT folks! I'm pleased to announce the v4.11.5-rt1 patch set. The release has been delayed due to the hotplug rework that was started before the final v4.11 release. However the new code has not been stabilized yet and it was decided to bring back the old patches before delaying the v4.11-RT release any longer. We will try to complete the hotplug rework (for RT) in the v4.11 cycle. Changes since v4.9.39-rt21: - rebase to v4.11.5 Known issues - CPU hotplug got a little better but can deadlock. You can get this release via the git tree at: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git v4.11.5-rt1 The RT patch against v4.11.5 can be found here: https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.11/older/patch-4.11.5-rt1.patch.xz The split quilt queue is available at: https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.11/older/patches-4.11.5-rt1.tar.xz Sebastian Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
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 6db6951f9982..8827d153e2a1 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
-@@ -301,6 +301,11 @@ void synchronize_rcu(void);
+@@ -261,6 +261,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 */
-@@ -326,6 +331,8 @@ static inline int rcu_preempt_depth(void
+@@ -286,6 +291,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
-@@ -7862,7 +7862,7 @@ void __init sched_init(void)
+@@ -6271,7 +6271,7 @@ void __init sched_init(void)
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
static inline int preempt_count_equals(int preempt_offset)
{