commit 600ee240d15e535d51e6c2b2f8475f0aa42885ea
author Paul Mundt <lethal@linux-sh.org> Mon Nov 19 19:13:38 2007 +0900
committer Paul Mundt <lethal@linux-sh.org> Mon Jan 28 13:18:48 2008 +0900
tree 95ca3ee293c43c104172debd3951c8693c27334d
parent 061854fd155116ab1f40c39a75e2c641827fd246

sh: Move over and enable FPU support for SH-5.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

arch/sh/Kconfig.sh64

diff --git a/arch/sh/Kconfig.sh64 b/arch/sh/Kconfig.sh64
index 10f5d30..e37cd8c 100644
--- a/arch/sh/Kconfig.sh64
+++ b/arch/sh/Kconfig.sh64
@@ -83,6 +83,7 @@
 
 config CPU_SH5
 	bool "SH-5"
+	select CPU_HAS_FPU
 
 endchoice
 

arch/sh/kernel/cpu/sh5/Makefile

diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile
index 7ea1073..6d388e8 100644
--- a/arch/sh/kernel/cpu/sh5/Makefile
+++ b/arch/sh/kernel/cpu/sh5/Makefile
@@ -1,3 +1,4 @@
 obj-y := entry.o switchto.o
 
 obj-$(CONFIG_KALLSYMS)		+= unwind.o
+obj-$(CONFIG_SH_FPU)		+= fpu.o

arch/sh/kernel/cpu/sh5/fpu.c

diff --git a/arch/sh64/kernel/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c
similarity index 98%
rename from arch/sh64/kernel/fpu.c
rename to arch/sh/kernel/cpu/sh5/fpu.c
index 8ad4ed6..d3f5e74 100644
--- a/arch/sh64/kernel/fpu.c
+++ b/arch/sh/kernel/cpu/sh5/fpu.c
@@ -152,7 +152,7 @@
 	if (last_task_used_math == current)
 		return;
 
-	grab_fpu();
+	enable_fpu();
 	if (last_task_used_math != NULL) {
 		/* Other processes fpu state, save away */
 		fpsave(&last_task_used_math->thread.fpu.hard);
@@ -165,6 +165,6 @@
 		fpload(&init_fpuregs.hard);
                 set_used_math();
         }
-	release_fpu();
+	disable_fpu();
 }
 

arch/sh/kernel/process_64.c

diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index 0761af4..0c2bc61 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -469,9 +469,9 @@
 	fpvalid = !!tsk_used_math(tsk);
 	if (fpvalid) {
 		if (current == last_task_used_math) {
-			grab_fpu();
+			enable_fpu();
 			fpsave(&tsk->thread.fpu.hard);
-			release_fpu();
+			disable_fpu();
 			last_task_used_math = 0;
 			regs->sr |= SR_FD;
 		}
@@ -496,9 +496,9 @@
 
 #ifdef CONFIG_SH_FPU
 	if(last_task_used_math == current) {
-		grab_fpu();
+		enable_fpu();
 		fpsave(&current->thread.fpu.hard);
-		release_fpu();
+		disable_fpu();
 		last_task_used_math = NULL;
 		regs->sr |= SR_FD;
 	}

arch/sh/kernel/signal_64.c

diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index 069fb60..08f403e 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -211,9 +211,9 @@
 		return err;
 
 	if (current == last_task_used_math) {
-		grab_fpu();
+		enable_fpu();
 		fpsave(&current->thread.fpu.hard);
-		release_fpu();
+		disable_fpu();
 		last_task_used_math = NULL;
 		regs->sr |= SR_FD;
 	}