arm64: fpsimd: Fix mismerge

Thanks to AKASHI Takahiro for identifying the issue.

Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 845fae3aeb26fb2aecbdb8e56011e4dd47942b1d..5ba0217df39b7463bb76e7b96cb499c412470ffe 100644 (file)
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -158,6 +158,7 @@ void fpsimd_flush_thread(void)
        preempt_disable();
        memset(&current->thread.fpsimd_state, 0, sizeof(struct fpsimd_state));
        set_thread_flag(TIF_FOREIGN_FPSTATE);
+       preempt_enable();
 }
 
 /*