mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 12:16:20 +00:00
sh: Fix up FPU build for SH5
After the recent FPU optimisation commit the signature of save_fpu() changed. "regs" wasn't used in the implementation of save_fpu() anyway. Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
e76fe57447
commit
61cc7b0a17
5 changed files with 9 additions and 9 deletions
|
@ -34,7 +34,7 @@ static union sh_fpu_union init_fpuregs = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
void save_fpu(struct task_struct *tsk, struct pt_regs *regs)
|
void save_fpu(struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
asm volatile("fst.p %0, (0*8), fp0\n\t"
|
asm volatile("fst.p %0, (0*8), fp0\n\t"
|
||||||
"fst.p %0, (1*8), fp2\n\t"
|
"fst.p %0, (1*8), fp2\n\t"
|
||||||
|
@ -153,7 +153,7 @@ do_fpu_state_restore(unsigned long ex, struct pt_regs *regs)
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
if (last_task_used_math != NULL)
|
if (last_task_used_math != NULL)
|
||||||
/* Other processes fpu state, save away */
|
/* Other processes fpu state, save away */
|
||||||
save_fpu(last_task_used_math, regs);
|
save_fpu(last_task_used_math);
|
||||||
|
|
||||||
last_task_used_math = current;
|
last_task_used_math = current;
|
||||||
if (used_math()) {
|
if (used_math()) {
|
||||||
|
|
|
@ -404,7 +404,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
|
||||||
if (fpvalid) {
|
if (fpvalid) {
|
||||||
if (current == last_task_used_math) {
|
if (current == last_task_used_math) {
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
save_fpu(tsk, regs);
|
save_fpu(tsk);
|
||||||
disable_fpu();
|
disable_fpu();
|
||||||
last_task_used_math = 0;
|
last_task_used_math = 0;
|
||||||
regs->sr |= SR_FD;
|
regs->sr |= SR_FD;
|
||||||
|
@ -431,7 +431,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
|
||||||
#ifdef CONFIG_SH_FPU
|
#ifdef CONFIG_SH_FPU
|
||||||
if(last_task_used_math == current) {
|
if(last_task_used_math == current) {
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
save_fpu(current, regs);
|
save_fpu(current);
|
||||||
disable_fpu();
|
disable_fpu();
|
||||||
last_task_used_math = NULL;
|
last_task_used_math = NULL;
|
||||||
regs->sr |= SR_FD;
|
regs->sr |= SR_FD;
|
||||||
|
|
|
@ -82,7 +82,7 @@ get_fpu_long(struct task_struct *task, unsigned long addr)
|
||||||
|
|
||||||
if (last_task_used_math == task) {
|
if (last_task_used_math == task) {
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
save_fpu(task, regs);
|
save_fpu(task);
|
||||||
disable_fpu();
|
disable_fpu();
|
||||||
last_task_used_math = 0;
|
last_task_used_math = 0;
|
||||||
regs->sr |= SR_FD;
|
regs->sr |= SR_FD;
|
||||||
|
@ -118,7 +118,7 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data)
|
||||||
set_stopped_child_used_math(task);
|
set_stopped_child_used_math(task);
|
||||||
} else if (last_task_used_math == task) {
|
} else if (last_task_used_math == task) {
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
save_fpu(task, regs);
|
save_fpu(task);
|
||||||
disable_fpu();
|
disable_fpu();
|
||||||
last_task_used_math = 0;
|
last_task_used_math = 0;
|
||||||
regs->sr |= SR_FD;
|
regs->sr |= SR_FD;
|
||||||
|
|
|
@ -314,7 +314,7 @@ setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc)
|
||||||
|
|
||||||
if (current == last_task_used_math) {
|
if (current == last_task_used_math) {
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
save_fpu(current, regs);
|
save_fpu(current);
|
||||||
disable_fpu();
|
disable_fpu();
|
||||||
last_task_used_math = NULL;
|
last_task_used_math = NULL;
|
||||||
regs->sr |= SR_FD;
|
regs->sr |= SR_FD;
|
||||||
|
|
|
@ -600,7 +600,7 @@ static int misaligned_fpu_load(struct pt_regs *regs,
|
||||||
indexed by register number. */
|
indexed by register number. */
|
||||||
if (last_task_used_math == current) {
|
if (last_task_used_math == current) {
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
save_fpu(current, regs);
|
save_fpu(current);
|
||||||
disable_fpu();
|
disable_fpu();
|
||||||
last_task_used_math = NULL;
|
last_task_used_math = NULL;
|
||||||
regs->sr |= SR_FD;
|
regs->sr |= SR_FD;
|
||||||
|
@ -673,7 +673,7 @@ static int misaligned_fpu_store(struct pt_regs *regs,
|
||||||
indexed by register number. */
|
indexed by register number. */
|
||||||
if (last_task_used_math == current) {
|
if (last_task_used_math == current) {
|
||||||
enable_fpu();
|
enable_fpu();
|
||||||
save_fpu(current, regs);
|
save_fpu(current);
|
||||||
disable_fpu();
|
disable_fpu();
|
||||||
last_task_used_math = NULL;
|
last_task_used_math = NULL;
|
||||||
regs->sr |= SR_FD;
|
regs->sr |= SR_FD;
|
||||||
|
|
Loading…
Reference in a new issue