diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 22:31:35 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 22:31:35 +0100 |
| commit | d60f5198ecfa9ed47e28fe9d416d5e9bcc662aca (patch) | |
| tree | 4d3a4f61c6b27b5f61ca93a7e5ebbd7c8b8cf873 /arch/mips/include/asm/fpu.h | |
| parent | f9cda64aa83b324953b11e2ca0a5b5c72a98a72e (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
| download | linux-d60f5198ecfa9ed47e28fe9d416d5e9bcc662aca.tar.gz linux-d60f5198ecfa9ed47e28fe9d416d5e9bcc662aca.tar.bz2 linux-d60f5198ecfa9ed47e28fe9d416d5e9bcc662aca.zip | |
Merge tag 'v3.18-rc4' into next/dt2
Linux 3.18-rc4 is a dependency for the phy-dt-header branch that
is needed for the final mvebu DT changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mips/include/asm/fpu.h')
| -rw-r--r-- | arch/mips/include/asm/fpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h index 4d0aeda68397..dd562414cd5e 100644 --- a/arch/mips/include/asm/fpu.h +++ b/arch/mips/include/asm/fpu.h @@ -145,8 +145,8 @@ static inline void lose_fpu(int save) if (is_msa_enabled()) { if (save) { save_msa(current); - asm volatile("cfc1 %0, $31" - : "=r"(current->thread.fpu.fcr31)); + current->thread.fpu.fcr31 = + read_32bit_cp1_register(CP1_STATUS); } disable_msa(); clear_thread_flag(TIF_USEDMSA); |