From: Mark Brown <broonie@kernel.org>
Date: Mon, 6 Oct 2014 16:26:36 +0000 (+0100)
Subject: arm64: fpsimd: Fix mismerge
X-Git-Tag: firefly_0821_release~3680^2~61
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=defd110d5c8bd987868c8269f8dc7860fd6daec1;p=firefly-linux-kernel-4.4.55.git

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 845fae3aeb26..5ba0217df39b 100644
--- 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();
 }
 
 /*