summaryrefslogtreecommitdiffstats
path: root/arch/riscv/include
diff options
context:
space:
mode:
authorVincent Chen <vincent.chen@sifive.com>2019-08-14 16:23:53 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-25 10:47:51 +0200
commit28fd9b37b6bb86c5d90694f4493c46b7d71cf9a6 (patch)
tree5f0b4809440299293e2ac3876ceb0bd3d5c07d93 /arch/riscv/include
parentcef0e9eb22315f7c5f3126eb5003e3ea0348ee93 (diff)
downloadlinux-stable-28fd9b37b6bb86c5d90694f4493c46b7d71cf9a6.tar.gz
linux-stable-28fd9b37b6bb86c5d90694f4493c46b7d71cf9a6.tar.bz2
linux-stable-28fd9b37b6bb86c5d90694f4493c46b7d71cf9a6.zip
riscv: Make __fstate_clean() work correctly.
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>
Diffstat (limited to 'arch/riscv/include')
-rw-r--r--arch/riscv/include/asm/switch_to.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/switch_to.h b/arch/riscv/include/asm/switch_to.h
index dd6b05bff75b..d911a8c2314d 100644
--- 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_struct *restore_from);
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,