commit 2666e476022c678b3758e753b20c22ca598dc73f
author Daniel Hellstrom <daniel@gaisler.com> Wed Jan 26 06:37:05 2011 +0000
committer David S. Miller <davem@davemloft.net> Wed Mar 16 18:19:05 2011 -0700
tree 63703a00065e35c6898e5cc36fb81826fad6f938
parent 7279b82cb1975ba4e337a549757f17418cfdffad

sparc32/leon: FPU-FSR only available when FPU present

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

arch/sparc/kernel/cpu.c

diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 0dc714f..7925c54 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -324,7 +324,7 @@
 	psr = get_psr();
 	put_psr(psr | PSR_EF);
 #ifdef CONFIG_SPARC_LEON
-	fpu_vers = 7;
+	fpu_vers = get_psr() & PSR_EF ? ((get_fsr() >> 17) & 0x7) : 7;
 #else
 	fpu_vers = ((get_fsr() >> 17) & 0x7);
 #endif