projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[linux-2.6-microblaze.git]
/
arch
/
mips
/
include
/
asm
/
fpu.h
diff --git
a/arch/mips/include/asm/fpu.h
b/arch/mips/include/asm/fpu.h
index
affebb7
..
dd083e9
100644
(file)
--- a/
arch/mips/include/asm/fpu.h
+++ b/
arch/mips/include/asm/fpu.h
@@
-68,7
+68,8
@@
static inline int __enable_fpu(enum fpu_mode mode)
goto fr_common;
case FPU_64BIT:
-#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_64BIT))
+#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_CPU_MIPS32_R6) \
+ || defined(CONFIG_64BIT))
/* we only have a 32-bit FPU */
return SIGFPE;
#endif