diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-22 11:57:32 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-22 11:57:32 -0600 |
| commit | 6d11fb454b161a4565c57be6f1c5527235741003 (patch) | |
| tree | c238ed3df2f654181c2a0746478a33b32214cc60 /arch/arm64/kernel/fpsimd.c | |
| parent | b207892b061da7608878e273ae22ba9bf9be264b (diff) | |
| parent | 8b95741569eabc5eb17da71d1d3668cdb0bef86c (diff) | |
| download | linux-6d11fb454b161a4565c57be6f1c5527235741003.tar.gz linux-6d11fb454b161a4565c57be6f1c5527235741003.tar.bz2 linux-6d11fb454b161a4565c57be6f1c5527235741003.zip | |
Merge branch 'for-linus' into for-3.18/core
Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.
Diffstat (limited to 'arch/arm64/kernel/fpsimd.c')
| -rw-r--r-- | arch/arm64/kernel/fpsimd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index ad8aebb1cdef..3dca15634e69 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -270,6 +270,7 @@ static int fpsimd_cpu_pm_notifier(struct notifier_block *self, case CPU_PM_ENTER: if (current->mm && !test_thread_flag(TIF_FOREIGN_FPSTATE)) fpsimd_save_state(¤t->thread.fpsimd_state); + this_cpu_write(fpsimd_last_state, NULL); break; case CPU_PM_EXIT: if (current->mm) |