Commit 6ba65383 authored by Paul Mundt's avatar Paul Mundt

sh: Fix up the FPU emulation build.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b9e39c89
...@@ -25,6 +25,7 @@ void fpu_state_restore(struct pt_regs *regs); ...@@ -25,6 +25,7 @@ void fpu_state_restore(struct pt_regs *regs);
#define save_fpu(tsk) do { } while (0) #define save_fpu(tsk) do { } while (0)
#define release_fpu(regs) do { } while (0) #define release_fpu(regs) do { } while (0)
#define grab_fpu(regs) do { } while (0) #define grab_fpu(regs) do { } while (0)
#define fpu_state_restore(regs) do { } while (0)
#endif #endif
......
...@@ -300,13 +300,11 @@ __switch_to(struct task_struct *prev, struct task_struct *next) ...@@ -300,13 +300,11 @@ __switch_to(struct task_struct *prev, struct task_struct *next)
{ {
struct thread_struct *next_t = &next->thread; struct thread_struct *next_t = &next->thread;
#if defined(CONFIG_SH_FPU)
unlazy_fpu(prev, task_pt_regs(prev)); unlazy_fpu(prev, task_pt_regs(prev));
/* we're going to use this soon, after a few expensive things */ /* we're going to use this soon, after a few expensive things */
if (next->fpu_counter > 5) if (next->fpu_counter > 5)
prefetch(&next_t->fpu.hard); prefetch(&next_t->fpu.hard);
#endif
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
/* /*
...@@ -337,15 +335,13 @@ __switch_to(struct task_struct *prev, struct task_struct *next) ...@@ -337,15 +335,13 @@ __switch_to(struct task_struct *prev, struct task_struct *next)
#endif #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 * restore of the math state immediately to avoid the trap; the
* chances of needing FPU soon are obviously high now * 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)); fpu_state_restore(task_pt_regs(next));
}
#endif
return prev; return prev;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment