diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-23 10:13:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-23 10:13:36 +0100 |
| commit | eda2360ad18b7cde87728fad85c6735a52c2576e (patch) | |
| tree | 2bc28704b40686c0d3d0fd5aa7d000f9d9dd153f /arch/x86/include/asm/fpu-internal.h | |
| parent | 1d23c4518b1f3a03c278f23333149245c178d2a6 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| download | linux-eda2360ad18b7cde87728fad85c6735a52c2576e.tar.gz linux-eda2360ad18b7cde87728fad85c6735a52c2576e.tar.bz2 linux-eda2360ad18b7cde87728fad85c6735a52c2576e.zip | |
Merge tag 'v4.0-rc5' into x86/fpu, to prevent conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/fpu-internal.h')
| -rw-r--r-- | arch/x86/include/asm/fpu-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h index 5fa1be21ac2a..810f20fd4e4e 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h @@ -397,7 +397,7 @@ static inline void drop_fpu(struct task_struct *tsk) preempt_disable(); tsk->thread.fpu_counter = 0; __drop_fpu(tsk); - clear_used_math(); + clear_stopped_child_used_math(tsk); preempt_enable(); } |