diff options
| author | Matt Fleming <matt@console-pimps.org> | 2009-12-14 15:12:04 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-14 22:07:36 -0500 |
| commit | 61cc7b0a172b047aa6d2c3e8b62bb1590f37e897 (patch) | |
| tree | fb545a6d36c771c47afd7d3ecd57611b3bb47a7a | |
| parent | e76fe57447e88916954bdcab1c0d2c708ec3c943 (diff) | |
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>
| -rw-r--r-- | arch/sh/kernel/cpu/sh5/fpu.c | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/process_64.c | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/ptrace_64.c | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/signal_64.c | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/traps_64.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/sh/kernel/cpu/sh5/fpu.c b/arch/sh/kernel/cpu/sh5/fpu.c index dd4f51ffb50e..4648ccee6c4d 100644 --- a/arch/sh/kernel/cpu/sh5/fpu.c +++ b/arch/sh/kernel/cpu/sh5/fpu.c | |||
| @@ -34,7 +34,7 @@ static union sh_fpu_union init_fpuregs = { | |||
| 34 | } | 34 | } |
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | void save_fpu(struct task_struct *tsk, struct pt_regs *regs) | 37 | void save_fpu(struct task_struct *tsk) |
| 38 | { | 38 | { |
| 39 | asm volatile("fst.p %0, (0*8), fp0\n\t" | 39 | asm volatile("fst.p %0, (0*8), fp0\n\t" |
| 40 | "fst.p %0, (1*8), fp2\n\t" | 40 | "fst.p %0, (1*8), fp2\n\t" |
| @@ -153,7 +153,7 @@ do_fpu_state_restore(unsigned long ex, struct pt_regs *regs) | |||
| 153 | enable_fpu(); | 153 | enable_fpu(); |
| 154 | if (last_task_used_math != NULL) | 154 | if (last_task_used_math != NULL) |
| 155 | /* Other processes fpu state, save away */ | 155 | /* Other processes fpu state, save away */ |
| 156 | save_fpu(last_task_used_math, regs); | 156 | save_fpu(last_task_used_math); |
| 157 | 157 | ||
| 158 | last_task_used_math = current; | 158 | last_task_used_math = current; |
| 159 | if (used_math()) { | 159 | if (used_math()) { |
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c index 359b8a2f4d2e..31f80c61b031 100644 --- a/arch/sh/kernel/process_64.c +++ b/arch/sh/kernel/process_64.c | |||
| @@ -404,7 +404,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu) | |||
| 404 | if (fpvalid) { | 404 | if (fpvalid) { |
| 405 | if (current == last_task_used_math) { | 405 | if (current == last_task_used_math) { |
| 406 | enable_fpu(); | 406 | enable_fpu(); |
| 407 | save_fpu(tsk, regs); | 407 | save_fpu(tsk); |
| 408 | disable_fpu(); | 408 | disable_fpu(); |
| 409 | last_task_used_math = 0; | 409 | last_task_used_math = 0; |
| 410 | regs->sr |= SR_FD; | 410 | regs->sr |= SR_FD; |
| @@ -431,7 +431,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, | |||
| 431 | #ifdef CONFIG_SH_FPU | 431 | #ifdef CONFIG_SH_FPU |
| 432 | if(last_task_used_math == current) { | 432 | if(last_task_used_math == current) { |
| 433 | enable_fpu(); | 433 | enable_fpu(); |
| 434 | save_fpu(current, regs); | 434 | save_fpu(current); |
| 435 | disable_fpu(); | 435 | disable_fpu(); |
| 436 | last_task_used_math = NULL; | 436 | last_task_used_math = NULL; |
| 437 | regs->sr |= SR_FD; | 437 | regs->sr |= SR_FD; |
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c index 952da83903da..873ebdc4f98e 100644 --- a/arch/sh/kernel/ptrace_64.c +++ b/arch/sh/kernel/ptrace_64.c | |||
| @@ -82,7 +82,7 @@ get_fpu_long(struct task_struct *task, unsigned long addr) | |||
| 82 | 82 | ||
| 83 | if (last_task_used_math == task) { | 83 | if (last_task_used_math == task) { |
| 84 | enable_fpu(); | 84 | enable_fpu(); |
| 85 | save_fpu(task, regs); | 85 | save_fpu(task); |
| 86 | disable_fpu(); | 86 | disable_fpu(); |
| 87 | last_task_used_math = 0; | 87 | last_task_used_math = 0; |
| 88 | regs->sr |= SR_FD; | 88 | regs->sr |= SR_FD; |
| @@ -118,7 +118,7 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data) | |||
| 118 | set_stopped_child_used_math(task); | 118 | set_stopped_child_used_math(task); |
| 119 | } else if (last_task_used_math == task) { | 119 | } else if (last_task_used_math == task) { |
| 120 | enable_fpu(); | 120 | enable_fpu(); |
| 121 | save_fpu(task, regs); | 121 | save_fpu(task); |
| 122 | disable_fpu(); | 122 | disable_fpu(); |
| 123 | last_task_used_math = 0; | 123 | last_task_used_math = 0; |
| 124 | regs->sr |= SR_FD; | 124 | regs->sr |= SR_FD; |
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c index feb3dddd3192..ce76dbdef294 100644 --- a/arch/sh/kernel/signal_64.c +++ b/arch/sh/kernel/signal_64.c | |||
| @@ -314,7 +314,7 @@ setup_sigcontext_fpu(struct pt_regs *regs, struct sigcontext __user *sc) | |||
| 314 | 314 | ||
| 315 | if (current == last_task_used_math) { | 315 | if (current == last_task_used_math) { |
| 316 | enable_fpu(); | 316 | enable_fpu(); |
| 317 | save_fpu(current, regs); | 317 | save_fpu(current); |
| 318 | disable_fpu(); | 318 | disable_fpu(); |
| 319 | last_task_used_math = NULL; | 319 | last_task_used_math = NULL; |
| 320 | regs->sr |= SR_FD; | 320 | regs->sr |= SR_FD; |
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c index 75c0cbe2eda0..d86f5315a0c1 100644 --- a/arch/sh/kernel/traps_64.c +++ b/arch/sh/kernel/traps_64.c | |||
| @@ -600,7 +600,7 @@ static int misaligned_fpu_load(struct pt_regs *regs, | |||
| 600 | indexed by register number. */ | 600 | indexed by register number. */ |
| 601 | if (last_task_used_math == current) { | 601 | if (last_task_used_math == current) { |
| 602 | enable_fpu(); | 602 | enable_fpu(); |
| 603 | save_fpu(current, regs); | 603 | save_fpu(current); |
| 604 | disable_fpu(); | 604 | disable_fpu(); |
| 605 | last_task_used_math = NULL; | 605 | last_task_used_math = NULL; |
| 606 | regs->sr |= SR_FD; | 606 | regs->sr |= SR_FD; |
| @@ -673,7 +673,7 @@ static int misaligned_fpu_store(struct pt_regs *regs, | |||
| 673 | indexed by register number. */ | 673 | indexed by register number. */ |
| 674 | if (last_task_used_math == current) { | 674 | if (last_task_used_math == current) { |
| 675 | enable_fpu(); | 675 | enable_fpu(); |
| 676 | save_fpu(current, regs); | 676 | save_fpu(current); |
| 677 | disable_fpu(); | 677 | disable_fpu(); |
| 678 | last_task_used_math = NULL; | 678 | last_task_used_math = NULL; |
| 679 | regs->sr |= SR_FD; | 679 | regs->sr |= SR_FD; |
