From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 18 Aug 2019 12:12:10 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.19.68~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08a324e34335f4d97de2effd2f96942e0a756ceb;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	riscv-make-__fstate_clean-work-correctly.patch
---

diff --git a/queue-4.19/riscv-make-__fstate_clean-work-correctly.patch b/queue-4.19/riscv-make-__fstate_clean-work-correctly.patch
new file mode 100644
index 00000000000..c80cb2b627e
--- /dev/null
+++ b/queue-4.19/riscv-make-__fstate_clean-work-correctly.patch
@@ -0,0 +1,36 @@
+From 69703eb9a8ae28a46cd5bce7d69ceeef6273a104 Mon Sep 17 00:00:00 2001
+From: Vincent Chen <vincent.chen@sifive.com>
+Date: Wed, 14 Aug 2019 16:23:53 +0800
+Subject: riscv: Make __fstate_clean() work correctly.
+
+From: Vincent Chen <vincent.chen@sifive.com>
+
+commit 69703eb9a8ae28a46cd5bce7d69ceeef6273a104 upstream.
+
+Make the __fstate_clean() function correctly set the
+state of sstatus.FS in pt_regs to SR_FS_CLEAN.
+
+Fixes: 7db91e57a0acd ("RISC-V: Task implementation")
+Cc: linux-stable <stable@vger.kernel.org>
+Signed-off-by: Vincent Chen <vincent.chen@sifive.com>
+Reviewed-by: Anup Patel <anup@brainfault.org>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+[paul.walmsley@sifive.com: expanded "Fixes" commit ID]
+Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/riscv/include/asm/switch_to.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/riscv/include/asm/switch_to.h
++++ b/arch/riscv/include/asm/switch_to.h
+@@ -23,7 +23,7 @@ extern void __fstate_restore(struct task
+ 
+ static inline void __fstate_clean(struct pt_regs *regs)
+ {
+-	regs->sstatus |= (regs->sstatus & ~(SR_FS)) | SR_FS_CLEAN;
++	regs->sstatus = (regs->sstatus & ~SR_FS) | SR_FS_CLEAN;
+ }
+ 
+ static inline void fstate_save(struct task_struct *task,
diff --git a/queue-4.19/series b/queue-4.19/series
index bd4b463b185..32da3ac8c6b 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -22,3 +22,4 @@ input-kbtab-sanity-check-for-endpoint-type.patch
 input-iforce-add-sanity-checks.patch
 net-usb-pegasus-fix-improper-read-if-get_registers-fail.patch
 netfilter-ebtables-also-count-base-chain-policies.patch
+riscv-make-__fstate_clean-work-correctly.patch