From defd110d5c8bd987868c8269f8dc7860fd6daec1 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 6 Oct 2014 17:26:36 +0100 Subject: [PATCH] arm64: fpsimd: Fix mismerge Thanks to AKASHI Takahiro for identifying the issue. Signed-off-by: Mark Brown --- arch/arm64/kernel/fpsimd.c | 1 + 1 file changed, 1 insertion(+) 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(¤t->thread.fpsimd_state, 0, sizeof(struct fpsimd_state)); set_thread_flag(TIF_FOREIGN_FPSTATE); + preempt_enable(); } /* -- 2.34.1