summaryrefslogtreecommitdiff
path: root/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch')
-rw-r--r--patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch b/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch
index e5a6d818bfd0..84bfb547d896 100644
--- a/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch
+++ b/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch
@@ -29,7 +29,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
-@@ -243,7 +243,19 @@ void rcu_sched_qs(void)
+@@ -244,7 +244,19 @@ void rcu_sched_qs(void)
this_cpu_ptr(&rcu_sched_data), true);
}
@@ -60,7 +60,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
#include <linux/sched/isolation.h>
#include <uapi/linux/sched/types.h>
#include "../time/tick-internal.h"
-@@ -1336,7 +1337,7 @@ static void rcu_prepare_kthreads(int cpu
+@@ -1407,7 +1408,7 @@ static void rcu_prepare_kthreads(int cpu
#endif /* #else #ifdef CONFIG_RCU_BOOST */
@@ -69,7 +69,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
/*
* Check to see if any future RCU-related work will need to be done
-@@ -1352,7 +1353,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nex
+@@ -1423,7 +1424,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nex
*nextevt = KTIME_MAX;
return rcu_cpu_has_callbacks(NULL);
}
@@ -79,7 +79,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
/*
* Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up
* after it.
-@@ -1448,6 +1451,8 @@ static bool __maybe_unused rcu_try_advan
+@@ -1520,6 +1523,8 @@ static bool __maybe_unused rcu_try_advan
return cbs_ready;
}
@@ -88,7 +88,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
/*
* Allow the CPU to enter dyntick-idle mode unless it has callbacks ready
* to invoke. If the CPU has callbacks, try to advance them. Tell the
-@@ -1490,6 +1495,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nex
+@@ -1562,6 +1567,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nex
*nextevt = basemono + dj * TICK_NSEC;
return 0;
}