summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2019-08-16 16:31:49 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2019-08-16 16:31:49 +0200
commitef6ada466428041b65040e04320f29ec88b6db2b (patch)
treebc32f143f842e8bdc06fd9f43c725c31274f9fe3
parenteb3c3c3494cfc4f96da48b032740632250a35314 (diff)
downloadlinux-rt-5.2.9-rt2-patches.tar.gz
[ANNOUNCE] v5.2.9-rt2v5.2.9-rt2-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-rw-r--r--patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch6
-rw-r--r--patches/arch-arm64-Add-lazy-preempt-support.patch4
-rw-r--r--patches/genirq-force-threading.patch6
-rw-r--r--patches/kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch2
-rw-r--r--patches/localversion.patch2
5 files changed, 10 insertions, 10 deletions
diff --git a/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch b/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
index d23f7788746e..8db1739d19f0 100644
--- a/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
+++ b/patches/NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
@@ -36,7 +36,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
mutex_lock(&sp->so_delegreturn_mutex);
- seq = raw_seqcount_begin(&sp->so_reclaim_seqcount);
+ seq = read_seqbegin(&sp->so_reclaim_seqlock);
- err = nfs4_open_delegation_recall(ctx, state, stateid, type);
+ err = nfs4_open_delegation_recall(ctx, state, stateid);
if (!err)
err = nfs_delegation_claim_locks(state, stateid);
- if (!err && read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
@@ -57,7 +57,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
-@@ -2911,7 +2911,7 @@ static int _nfs4_open_and_get_state(stru
+@@ -2914,7 +2914,7 @@ static int _nfs4_open_and_get_state(stru
unsigned int seq;
int ret;
@@ -66,7 +66,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
ret = _nfs4_proc_open(opendata, ctx);
if (ret != 0)
-@@ -2952,7 +2952,7 @@ static int _nfs4_open_and_get_state(stru
+@@ -2955,7 +2955,7 @@ static int _nfs4_open_and_get_state(stru
if (d_inode(dentry) == state->inode) {
nfs_inode_attach_open_context(ctx);
diff --git a/patches/arch-arm64-Add-lazy-preempt-support.patch b/patches/arch-arm64-Add-lazy-preempt-support.patch
index 8c3bdb8484ff..36ba5e69c39e 100644
--- a/patches/arch-arm64-Add-lazy-preempt-support.patch
+++ b/patches/arch-arm64-Add-lazy-preempt-support.patch
@@ -116,7 +116,7 @@ Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
DEFINE(TSK_TI_TTBR0, offsetof(struct task_struct, thread_info.ttbr0));
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
-@@ -647,9 +647,17 @@ alternative_if ARM64_HAS_IRQ_PRIO_MASKIN
+@@ -679,9 +679,17 @@ alternative_if ARM64_HAS_IRQ_PRIO_MASKIN
mrs x0, daif
orr x24, x24, x0
alternative_else_nop_endif
@@ -134,7 +134,7 @@ Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
+ bl preempt_schedule_irq // irq en/disable is done inside
+2:
#endif
- #ifdef CONFIG_TRACE_IRQFLAGS
+
#ifdef CONFIG_ARM64_PSEUDO_NMI
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
diff --git a/patches/genirq-force-threading.patch b/patches/genirq-force-threading.patch
index 893619965cbe..067ecf8d2c30 100644
--- a/patches/genirq-force-threading.patch
+++ b/patches/genirq-force-threading.patch
@@ -27,7 +27,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
#endif
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
-@@ -23,6 +23,7 @@
+@@ -24,6 +24,7 @@
#include "internals.h"
#ifdef CONFIG_IRQ_FORCED_THREADING
@@ -35,11 +35,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
__read_mostly bool force_irqthreads;
EXPORT_SYMBOL_GPL(force_irqthreads);
-@@ -32,6 +33,7 @@ static int __init setup_forced_irqthread
+@@ -33,6 +34,7 @@ static int __init setup_forced_irqthread
return 0;
}
early_param("threadirqs", setup_forced_irqthreads);
+# endif
#endif
- static void __synchronize_hardirq(struct irq_desc *desc)
+ static void __synchronize_hardirq(struct irq_desc *desc, bool sync_chip)
diff --git a/patches/kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch b/patches/kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch
index bdf2999c89b6..2651027b4be0 100644
--- a/patches/kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch
+++ b/patches/kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch
@@ -39,7 +39,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ put_task_stack(tsk);
+
cgroup_free(tsk);
- task_numa_free(tsk);
+ task_numa_free(tsk, true);
security_task_free(tsk);
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
diff --git a/patches/localversion.patch b/patches/localversion.patch
index a02382e6df70..279489a1d145 100644
--- a/patches/localversion.patch
+++ b/patches/localversion.patch
@@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- /dev/null
+++ b/localversion-rt
@@ -0,0 +1 @@
-+-rt1
++-rt2