Skip to content

Commit

Permalink
sh: Fix up the FPU emulation build.
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Nov 25, 2009
1 parent b9e39c8 commit 6ba6538
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions arch/sh/include/asm/fpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 3 additions & 7 deletions arch/sh/kernel/process_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
/*
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 6ba6538

Please sign in to comment.