aboutsummaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-11-25 12:07:31 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-11-25 12:07:31 +0900
commit6ba653830c85a37d0a054f1e43d9b51e59d1150b (patch)
tree2bbafd395a15b3f649fc346cc2a9c67485e0d3f5 /arch/sh
parentb9e39c89a9639e5005d8225a23fb7faf118a85eb (diff)
sh: Fix up the FPU emulation build.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/include/asm/fpu.h1
-rw-r--r--arch/sh/kernel/process_32.c10
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/sh/include/asm/fpu.h b/arch/sh/include/asm/fpu.h
index d7709c06fac..fb6bbb9b1cc 100644
--- a/arch/sh/include/asm/fpu.h
+++ b/arch/sh/include/asm/fpu.h
@@ -25,6 +25,7 @@ void fpu_state_restore(struct pt_regs *regs);
#define save_fpu(tsk) do { } while (0)
#define release_fpu(regs) do { } while (0)
#define grab_fpu(regs) do { } while (0)
+#define fpu_state_restore(regs) do { } while (0)
#endif
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index d721f9297c0..d8af889366a 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -300,13 +300,11 @@ __switch_to(struct task_struct *prev, struct task_struct *next)
{
struct thread_struct *next_t = &next->thread;
-#if defined(CONFIG_SH_FPU)
unlazy_fpu(prev, task_pt_regs(prev));
/* we're going to use this soon, after a few expensive things */
if (next->fpu_counter > 5)
prefetch(&next_t->fpu.hard);
-#endif
#ifdef CONFIG_MMU
/*
@@ -337,15 +335,13 @@ __switch_to(struct task_struct *prev, struct task_struct *next)
#endif
}
-#if defined(CONFIG_SH_FPU)
- /* If the task has used fpu the last 5 timeslices, just do a full
+ /*
+ * If the task has used fpu the last 5 timeslices, just do a full
* restore of the math state immediately to avoid the trap; the
* chances of needing FPU soon are obviously high now
*/
- if (next->fpu_counter > 5) {
+ if (next->fpu_counter > 5)
fpu_state_restore(task_pt_regs(next));
- }
-#endif
return prev;
}